From b45459d645631c7ed1ad1d10f39d0c090b339e74 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Sun, 24 Mar 2024 14:18:08 +0100
Subject: [PATCH] Sieve always allow fileinto INBOX #1510

---
 dev/Sieve/View/Filter.js                                      | 4 +---
 snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php         | 3 +--
 .../v/0.0.0/app/libraries/RainLoop/Config/Application.php     | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dev/Sieve/View/Filter.js b/dev/Sieve/View/Filter.js
index 14c6d0b38..ee7799d75 100644
--- a/dev/Sieve/View/Filter.js
+++ b/dev/Sieve/View/Filter.js
@@ -30,8 +30,6 @@ const
 			sDeepPrefix = '\u00A0\u00A0\u00A0',
 			showUnsubscribed = true/*!SettingsUserStore.hideUnsubscribed()*/,
 
-			disabled = rl.settings.get('sieveAllowFileintoInbox') ? '' : 'INBOX',
-
 			foldersWalk = folders => {
 				folders.forEach(oItem => {
 					if (showUnsubscribed || oItem.hasSubscriptions() || !oItem.exists) {
@@ -39,7 +37,7 @@ const
 							id: oItem.fullName,
 							name: sDeepPrefix.repeat(oItem.deep) + oItem.detailedName(),
 							system: false,
-							disabled: !oItem.selectable() || disabled == oItem.fullName
+							disabled: !oItem.selectable()
 						});
 					}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index 05f83884b..6da93ab07 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -603,8 +603,7 @@ class Actions
 						'showNextMessage' => (bool) $oConfig->Get('defaults', 'view_show_next_message', false),
 						'AutoLogout' => (int) $oConfig->Get('defaults', 'autologout', 30),
 						'AllowDraftAutosave' => (bool) $oConfig->Get('defaults', 'allow_draft_autosave', true),
-						'ContactsAutosave' => (bool) $oConfig->Get('defaults', 'contacts_autosave', true),
-						'sieveAllowFileintoInbox' => (bool)$oConfig->Get('labs', 'sieve_allow_fileinto_inbox', false)
+						'ContactsAutosave' => (bool) $oConfig->Get('defaults', 'contacts_autosave', true)
 					],
 					// MainAccount or AdditionalAccount
 					$this->getAccountData($oAccount)
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index 4547c4738..2d44ab4e8 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -421,7 +421,6 @@ Enables caching in the system'),
 				'log_ajax_response_write_limit' => array(300),
 				'smtp_show_server_errors' => array(false),
 				'sieve_auth_plain_initial' => array(true),
-				'sieve_allow_fileinto_inbox' => array(false),
 				'mail_func_clear_headers' => array(true, 'PHP mail() remove To and Subject headers'),
 				'mail_func_additional_parameters' => array(false, 'PHP mail() set -f emailaddress'),
 				'folders_spec_limit' => array(50),