diff --git a/dev/Stores/User/Folder.js b/dev/Stores/User/Folder.js
index db4bf257ee..1ed15acc91 100644
--- a/dev/Stores/User/Folder.js
+++ b/dev/Stores/User/Folder.js
@@ -2,6 +2,8 @@
 import ko from 'ko';
 import _ from '_';
 
+import {settingsGet} from 'Storage/Settings';
+
 import {FolderType} from 'Common/Enums';
 import {UNUSED_OPTION_VALUE} from 'Common/Consts';
 import {isArray, folderListOptionsBuilder} from 'Common/Utils';
@@ -35,6 +37,8 @@ class FolderUserStore
 
 		this.currentFolder = ko.observable(null).extend({toggleSubscribeProperty: [this, 'selected']});
 
+		this.sieveAllowFileintoInbox = !!settingsGet('SieveAllowFileintoInbox');
+
 		this.computers();
 		this.subscribers();
 	}
@@ -117,7 +121,7 @@ class FolderUserStore
 		this.folderMenuForFilters = ko.computed(
 			() => folderListOptionsBuilder(
 				this.folderListSystem(), this.folderList(),
-				['INBOX'], [['', '']], null, null, null, (item) => (item ? item.localName() : ''))
+				[(this.sieveAllowFileintoInbox ? '' : 'INBOX')], [['', '']], null, null, null, (item) => (item ? item.localName() : ''))
 		);
 	}
 
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index 7e38231258..4951703dd4 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -1531,6 +1531,7 @@ public function AppData($bAdmin, $bMobile = false, $bMobileDevice = false, $sAut
 			'DetermineUserDomain' => (bool) $oConfig->Get('login', 'determine_user_domain', false),
 			'UseLoginWelcomePage' => (bool) $oConfig->Get('login', 'welcome_page', false),
 			'StartupUrl' => \trim(\ltrim(\trim($oConfig->Get('labs', 'startup_url', '')), '#/')),
+			'SieveAllowFileintoInbox' => (bool) $oConfig->Get('labs', 'sieve_allow_fileinto_inbox', false),
 			'ContactsIsAllowed' => false,
 			'ChangePasswordIsAllowed' => false,
 			'RequireTwoFactor' => false,
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index efbd86179b..715c8a03ef 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -422,6 +422,7 @@ protected function defaultValues()
 				'sieve_allow_raw_script' => array(false),
 				'sieve_utf8_folder_name' => array(true),
 				'sieve_auth_plain_initial' => array(true),
+				'sieve_allow_fileinto_inbox' => array(false),
 				'imap_timeout' => array(300),
 				'smtp_timeout' => array(60),
 				'sieve_timeout' => array(10),