Added "Hide messages marked for deletion" #470

2025-09-07 13:44:13 +08:00 · 2022-08-02 14:20:07 +02:00 · 2022-08-02 14:20:07 +02:00 · 3d4f804e5f
commit 3d4f804e5f
parent 20aecf9514
48 changed files with 79 additions and 22 deletions
--- a/dev/Settings/User/General.js
+++ b/dev/Settings/User/General.js
@ -46,6 +46,7 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 		this.viewHTML = SettingsUserStore.viewHTML;
 		this.showImages = SettingsUserStore.showImages;
 		this.removeColors = SettingsUserStore.removeColors;
+		this.hideDeleted = SettingsUserStore.hideDeleted;
 		this.useCheckboxesInList = SettingsUserStore.useCheckboxesInList;
 		this.threadsAllowed = AppUserStore.threadsAllowed;
 		this.useThreads = SettingsUserStore.useThreads;
@ -92,7 +93,7 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 		this.addSetting('MessagesPerPage');
 		this.addSetting('Layout', () => MessagelistUserStore([]));

-		this.addSettings(['ViewHTML', 'ShowImages', 'UseCheckboxesInList', 'ReplySameFolder',
+		this.addSettings(['ViewHTML', 'ShowImages', 'HideDeleted', 'UseCheckboxesInList', 'ReplySameFolder',
 			'DesktopNotifications', 'SoundNotification']);

 		const fReloadLanguageHelper = (saveSettingsStep) => () => {
--- a/dev/Stores/User/Settings.js
+++ b/dev/Stores/User/Settings.js
@ -35,6 +35,7 @@ export const SettingsUserStore = new class {
 			useThreads: 0,
 			replySameFolder: 0,
 			hideUnsubscribed: 0,
+			hideDeleted: 1,
 			autoLogout: 0
 		});

@ -83,5 +84,6 @@ export const SettingsUserStore = new class {
 		self.replySameFolder(SettingsGet('ReplySameFolder'));

 		self.hideUnsubscribed(SettingsGet('HideUnsubscribed'));
+		self.hideDeleted(SettingsGet('HideDeleted'));
 	}
 };
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Config.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Config.php
@ -26,11 +26,6 @@ class Config
 	 */
 	public static $MessageListCountLimitTrigger = 0;

-	/**
-	 * @var bool
-	 */
-	public static $MessageListUndeletedOnly = true;
-
 	/**
 	 * @var int
 	 */
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SearchCriterias.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SearchCriterias.php
@ -127,7 +127,7 @@ abstract class SearchCriterias
 		X RECENT
 	*/

-	public static function fromString(\MailSo\Imap\ImapClient $oImapClient, string $sFolderName, string $sSearch, bool &$bUseCache = true) : string
+	public static function fromString(\MailSo\Imap\ImapClient $oImapClient, string $sFolderName, string $sSearch, bool $bHideDeleted, bool &$bUseCache = true) : string
 	{
 		$bUseCache = true;
 		$iTimeFilter = 0;
@ -216,6 +216,10 @@ abstract class SearchCriterias
 						case 'UNFLAGGED':
 						case 'SEEN':
 						case 'UNSEEN':
+						case 'ANSWERED':
+						case 'UNANSWERED':
+						case 'DELETED':
+						case 'UNDELETED':
 							$aCriteriasResult[] = $sName;
 							$bUseCache = false;
 							break;
@ -276,19 +280,15 @@ abstract class SearchCriterias
 			$aCriteriasResult[] = \gmdate('j-M-Y', $iTimeFilter);
 		}

-		$sCriteriasResult = \trim(\implode(' ', $aCriteriasResult));
-
-		$sCriteriasResult = \trim($sCriteriasResult);
-		if (\MailSo\Config::$MessageListUndeletedOnly) {
-			$sCriteriasResult = \trim($sCriteriasResult.' UNDELETED');
+		if ($bHideDeleted && !\in_array('DELETED', $aCriteriasResult) && !\in_array('UNDELETED', $aCriteriasResult)) {
+			$aCriteriasResult['UNDELETED'] = true;
 		}

-		$sCriteriasResult = \trim($sCriteriasResult);
 		if (\MailSo\Config::$MessageListPermanentFilter) {
-			$sCriteriasResult = \trim($sCriteriasResult.' '.\MailSo\Config::$MessageListPermanentFilter);
+			$aCriteriasResult[] = \MailSo\Config::$MessageListPermanentFilter;
 		}

-		$sCriteriasResult = \trim($sCriteriasResult);
+		$sCriteriasResult = \trim(\implode(' ', $aCriteriasResult));

 		return $sCriteriasResult ?: 'ALL';
 	}
@ -366,6 +366,10 @@ abstract class SearchCriterias
 				case 'UNFLAGGED':
 				case 'SEEN':
 				case 'UNSEEN':
+				case 'ANSWERED':
+				case 'UNANSWERED':
+				case 'DELETED':
+				case 'UNDELETED':
 					$aResult[$sName] = true;
 					break;
 			}
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
@ -700,10 +700,11 @@ class MailClient
 	 * @throws \MailSo\Net\Exceptions\Exception
 	 * @throws \MailSo\Imap\Exceptions\Exception
 	 */
-	public function GetUids(?\MailSo\Cache\CacheClient $oCacher, string $sSearch,
+	private function GetUids(MessageListParams $oParams, string $sSearch,
 		string $sFolderName, string $sFolderHash,
 		bool $bUseSortIfSupported = false, string $sSort = '') : array
 	{
+		$oCacher = $oParams->oCacher;
 		/* TODO: Validate $sSort
 			ARRIVAL
 				Internal date and time of the message.  This differs from the
@ -754,7 +755,7 @@ class MailClient

 		$bUseSortIfSupported = $bUseSortIfSupported && !\strlen($sSearch) && $this->oImapClient->IsSupported('SORT');

-		$sSearchCriterias = \MailSo\Imap\SearchCriterias::fromString($this->oImapClient, $sFolderName, $sSearch, $bUseCacheAfterSearch);
+		$sSearchCriterias = \MailSo\Imap\SearchCriterias::fromString($this->oImapClient, $sFolderName, $sSearch, $oParams->bHideDeleted, $bUseCacheAfterSearch);
 		if ($bUseCacheAfterSearch && $oCacher && $oCacher->IsInited())
 		{
 			$sSerializedHash = 'GetUids/'.
@ -902,7 +903,7 @@ class MailClient
 				}
 				else
 				{
-					$aUids = $this->GetUids($oParams->oCacher, '',
+					$aUids = $this->GetUids($oParams, '',
 						$oMessageCollection->FolderName, $oMessageCollection->FolderHash, $bUseSortIfSupported, $oParams->sSort);
 					// Remove all threaded UID's except the most recent of each thread
 					$threadedUids = [];
@ -913,13 +914,13 @@ class MailClient
 					$aUids = \array_diff($aUids, $threadedUids);
 				}
 			} else {
-				$aUids = $this->GetUids($oParams->oCacher, '',
+				$aUids = $this->GetUids($oParams, '',
 					$oMessageCollection->FolderName, $oMessageCollection->FolderHash, $bUseSortIfSupported, $oParams->sSort);
 			}

 			if ($aUids && \strlen($sSearch))
 			{
-				$aSearchedUids = $this->GetUids($oParams->oCacher, $sSearch,
+				$aSearchedUids = $this->GetUids($oParams, $sSearch,
 					$oMessageCollection->FolderName, $oMessageCollection->FolderHash);
 				if ($bUseThreads && !$oParams->iThreadUid) {
 					$matchingThreadUids = [];
@ -958,7 +959,7 @@ class MailClient

 			if (\strlen($sSearch))
 			{
-				$aUids = $this->GetUids($oParams->oCacher, $sSearch,
+				$aUids = $this->GetUids($oParams, $sSearch,
 					$oMessageCollection->FolderName, $oMessageCollection->FolderHash);

 				$oMessageCollection->MessageResultCount = \count($aUids);
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageListParams.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageListParams.php
@ -19,6 +19,7 @@ class MessageListParams
 		$oCacher = null, // ?\MailSo\Cache\CacheClient
 		$bUseSortIfSupported = false, // bool
 		$bUseThreads = false, // bool
+		$bHideDeleted = true, // bool
 		$sSort = ''; // string

 	protected
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@ -736,6 +736,7 @@ class Actions
 			'ReplySameFolder' => (bool) $oConfig->Get('defaults', 'mail_reply_same_folder', false),
 			'ContactsAutosave' => (bool) $oConfig->Get('defaults', 'contacts_autosave', true),
 			'HideUnsubscribed' => false,
+			'HideDeleted' => true,
 			'MainEmail' => '',
 			'UserBackgroundName' => '',
 			'UserBackgroundHash' => ''
@ -834,6 +835,7 @@ class Actions
 					$aResult['HideUnsubscribed'] = (bool)$oSettingsLocal->GetConf('HideUnsubscribed', $aResult['HideUnsubscribed']);
 					$aResult['UseThreads'] = (bool)$oSettingsLocal->GetConf('UseThreads', $aResult['UseThreads']);
 					$aResult['ReplySameFolder'] = (bool)$oSettingsLocal->GetConf('ReplySameFolder', $aResult['ReplySameFolder']);
+					$aResult['HideDeleted'] = (bool)$oSettingsLocal->GetConf('HideDeleted', $aResult['HideDeleted']);
 				}

 				if ($oConfig->Get('login', 'determine_user_language', true)) {
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
@ -159,6 +159,7 @@ trait Accounts
 				$aResult['HideUnsubscribed'] = (bool) $oSettingsLocal->GetConf('HideUnsubscribed', false);
 				$aResult['UseThreads'] = (bool) $oSettingsLocal->GetConf('UseThreads', $oConfig->Get('defaults', 'mail_use_threads', false));
 				$aResult['ReplySameFolder'] = (bool) $oSettingsLocal->GetConf('ReplySameFolder', $oConfig->Get('defaults', 'mail_reply_same_folder', false));
+				$aResult['HideDeleted'] = (bool) $oSettingsLocal->GetConf('HideDeleted', true);
 			}
 //			$this->Plugins()->InitAppData($bAdmin, $aResult, $oAccount);

--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
@ -61,7 +61,7 @@ trait Messages
 			throw new ClientException(Notifications::CantGetMessageList);
 		}

-		$this->initMailClientConnection();
+		$oAccount = $this->initMailClientConnection();

 		try
 		{
@ -72,6 +72,11 @@ trait Messages
 			$oParams->oCacher = $this->cacherForUids();
 			$oParams->bUseSortIfSupported = !!$this->Config()->Get('labs', 'use_imap_sort', true);

+			$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
+			if ($oSettingsLocal instanceof \RainLoop\Settings) {
+				$oParams->bHideDeleted = empty($oSettingsLocal->GetConf('HideDeleted', 1));
+			}
+
 			$oMessageList = $this->MailClient()->MessageList($oParams);
 		}
 		catch (\Throwable $oException)
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
@ -349,6 +349,7 @@ trait User
 		$this->setSettingsFromParams($oSettingsLocal, 'UseThreads', 'bool');
 		$this->setSettingsFromParams($oSettingsLocal, 'ReplySameFolder', 'bool');
 		$this->setSettingsFromParams($oSettingsLocal, 'HideUnsubscribed', 'bool');
+		$this->setSettingsFromParams($oSettingsLocal, 'HideDeleted', 'bool');

 		return $this->DefaultResponse(__FUNCTION__,
 			$this->SettingsProvider()->Save($oAccount, $oSettings) &&
--- a/snappymail/v/0.0.0/app/localization/ar-SA/user.json
+++ b/snappymail/v/0.0.0/app/localization/ar-SA/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "عادي",
 		"LABEL_VIEW_OPTIONS": "إظهار الخيارات",
 		"LABEL_USE_PREVIEW_PANE": "استخدام جزئية العرض الجانبي",
+		"HIDE_DELETED_MESSAGES": "إخفاء الرسائل المحددة للحذف",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "عرض مربعات التحديد في القائمة",
 		"LABEL_USE_THREADS": "إستخدام المواضيع",
 		"LABEL_REPLY_SAME_FOLDER": "ضع الردود في مجلد الرسالة التي يتم الرد عليها",
--- a/snappymail/v/0.0.0/app/localization/bg-BG/user.json
+++ b/snappymail/v/0.0.0/app/localization/bg-BG/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Чист текст",
 		"LABEL_VIEW_OPTIONS": "Настройки на изгледа",
 		"LABEL_USE_PREVIEW_PANE": "Използвай поле за преглед",
+		"HIDE_DELETED_MESSAGES": "Скриване на съобщенията, маркирани за изтриване",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Показавай отметките в списъка",
 		"LABEL_USE_THREADS": "Използвай групиране на съобщенията",
 		"LABEL_REPLY_SAME_FOLDER": "Постави отговорите с папката на отговаряното съобщение",
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
+++ b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Text",
 		"LABEL_VIEW_OPTIONS": "Možnosti zobrazení",
 		"LABEL_USE_PREVIEW_PANE": "Používáte panel rychlého zobrazení",
+		"HIDE_DELETED_MESSAGES": "Skrýt zprávy označené ke smazání",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Zobrazení zaškrtávacích políček v seznamu",
 		"LABEL_USE_THREADS": "Zobrazit jako konverzace",
 		"LABEL_REPLY_SAME_FOLDER": "Ukládat odpovědi do složky se zprávou, které se týkají",
--- a/snappymail/v/0.0.0/app/localization/da-DK/user.json
+++ b/snappymail/v/0.0.0/app/localization/da-DK/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Plain",
 		"LABEL_VIEW_OPTIONS": "Visningsindstillinger",
 		"LABEL_USE_PREVIEW_PANE": "Brug preview panel",
+		"HIDE_DELETED_MESSAGES": "Skjul beskeder, der er markeret til sletning",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Vis afkrydsningsfelt i oversigten",
 		"LABEL_USE_THREADS": "Brug samtaler",
 		"LABEL_REPLY_SAME_FOLDER": "Placer svar i samme mappe som oprindelig meddelelse",
--- a/snappymail/v/0.0.0/app/localization/de-DE/user.json
+++ b/snappymail/v/0.0.0/app/localization/de-DE/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Unformatierter Text",
 		"LABEL_VIEW_OPTIONS": "Optionen anzeigen",
 		"LABEL_USE_PREVIEW_PANE": "Vorschaufenster nutzen",
+		"HIDE_DELETED_MESSAGES": "Zum Löschen markierte Nachrichten ausblenden",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Kontrollkästchen in der Liste anzeigen",
 		"LABEL_USE_THREADS": "Als Unterhaltungen anzeigen",
 		"LABEL_REPLY_SAME_FOLDER": "Antworten im gleichen Ordner wie die Nachricht, auf die geantwortet wurde, abspeichern",
--- a/snappymail/v/0.0.0/app/localization/el-GR/user.json
+++ b/snappymail/v/0.0.0/app/localization/el-GR/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Απλό",
 		"LABEL_VIEW_OPTIONS": "Επιλογές προβολής",
 		"LABEL_USE_PREVIEW_PANE": "Χρήση προεπισκόπησης ",
+		"HIDE_DELETED_MESSAGES": "Απόκρυψη μηνυμάτων που έχουν επισημανθεί για διαγραφή",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Εμφάνιση των κουτιών επιλογής σε λίστα",
 		"LABEL_USE_THREADS": "Χρήση νημάτων",
 		"LABEL_REPLY_SAME_FOLDER": "Τοποθέτηση απαντήσεων στο φάκελο που ανήκει το μήνυμα που απαντάται",
--- a/snappymail/v/0.0.0/app/localization/en-GB/user.json
+++ b/snappymail/v/0.0.0/app/localization/en-GB/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Plain",
 		"LABEL_VIEW_OPTIONS": "View options",
 		"LABEL_USE_PREVIEW_PANE": "Use preview pane",
+		"HIDE_DELETED_MESSAGES": "Hide messages marked for deletion",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Display checkboxes in list",
 		"LABEL_USE_THREADS": "Use threads",
 		"LABEL_REPLY_SAME_FOLDER": "Place replies in the folder of the message being replied to",
--- a/snappymail/v/0.0.0/app/localization/en/user.json
+++ b/snappymail/v/0.0.0/app/localization/en/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Plain",
 		"LABEL_VIEW_OPTIONS": "View options",
 		"LABEL_USE_PREVIEW_PANE": "Use preview pane",
+		"HIDE_DELETED_MESSAGES": "Hide messages marked for deletion",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Display checkboxes in list",
 		"LABEL_USE_THREADS": "Use threads",
 		"LABEL_REPLY_SAME_FOLDER": "Place replies in the folder of the message being replied to",
--- a/snappymail/v/0.0.0/app/localization/es-ES/user.json
+++ b/snappymail/v/0.0.0/app/localization/es-ES/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Texto plano",
 		"LABEL_VIEW_OPTIONS": "Ver opciones",
 		"LABEL_USE_PREVIEW_PANE": "Utilice el panel de vista previa",
+		"HIDE_DELETED_MESSAGES": "Ocultar mensajes marcados para borrar",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Mostrar casillas de verificación en la lista",
 		"LABEL_USE_THREADS": "Usar hilos de conversación",
 		"LABEL_REPLY_SAME_FOLDER": "Coloque las respuestas en la carpeta del mensaje que esta respondiendo.",
--- a/snappymail/v/0.0.0/app/localization/et-EE/user.json
+++ b/snappymail/v/0.0.0/app/localization/et-EE/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Lihttekst",
 		"LABEL_VIEW_OPTIONS": "Vaate seaded",
 		"LABEL_USE_PREVIEW_PANE": "Kasuta eelvaadet",
+		"HIDE_DELETED_MESSAGES": "Peida kustutamiseks märgitud kirjad",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Kuva nimekirjas valikukastikesi",
 		"LABEL_USE_THREADS": "Kasuta vestluse lõimesid",
 		"LABEL_REPLY_SAME_FOLDER": "Pane vastused samasse kausta, kus asub vastatud kiri",
--- a/snappymail/v/0.0.0/app/localization/fa-IR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fa-IR/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "ساده",
 		"LABEL_VIEW_OPTIONS": "مشاهده گزینه‌ها",
 		"LABEL_USE_PREVIEW_PANE": "استفاده از پنجره پیش‌نمایش",
+		"HIDE_DELETED_MESSAGES": "پنهان کردن پیام های علامت گذاری شده برای حذف",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "نمایش چک‌باکس در لیست",
 		"LABEL_USE_THREADS": "استفاده از حالت موضوعی",
 		"LABEL_REPLY_SAME_FOLDER": " جوابها را در پوشه‌ای که پیامها در آن جواب داده شده است قراردهید",
--- a/snappymail/v/0.0.0/app/localization/fi-FI/user.json
+++ b/snappymail/v/0.0.0/app/localization/fi-FI/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Pelkkä teksti",
 		"LABEL_VIEW_OPTIONS": "Näyttö-valinnat",
 		"LABEL_USE_PREVIEW_PANE": "Käytä esikatselua",
+		"HIDE_DELETED_MESSAGES": "Piilota poistettavaksi merkityt viestit",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Näytä valintaruudut listassa",
 		"LABEL_USE_THREADS": "Käytä keskustelunäkymää",
 		"LABEL_REPLY_SAME_FOLDER": "Siirrä vastaukset samaan kansioon vastattavien kanssa",
--- a/snappymail/v/0.0.0/app/localization/fr-FR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fr-FR/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Non-formaté",
 		"LABEL_VIEW_OPTIONS": "Voir les options",
 		"LABEL_USE_PREVIEW_PANE": "Utiliser le panneau de prévisualisation",
+		"HIDE_DELETED_MESSAGES": "Masquer les messages marqués pour suppression",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Afficher des cases à cocher dans la liste",
 		"LABEL_USE_THREADS": "Regrouper en conversations",
 		"LABEL_REPLY_SAME_FOLDER": "Placer les réponses dans le dossier du message",
--- a/snappymail/v/0.0.0/app/localization/hu-HU/user.json
+++ b/snappymail/v/0.0.0/app/localization/hu-HU/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Egyszerű",
 		"LABEL_VIEW_OPTIONS": "Nézet beállítások",
 		"LABEL_USE_PREVIEW_PANE": "Előnézeti ablak használata",
+		"HIDE_DELETED_MESSAGES": "A törlésre megjelölt üzenetek elrejtése",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Jelölőnégyzetek megjelenítése a listában",
 		"LABEL_USE_THREADS": "Szálak használata",
 		"LABEL_REPLY_SAME_FOLDER": "Válaszüzenetek elhelyezése az eredeti üzenet mappájában",
--- a/snappymail/v/0.0.0/app/localization/id-ID/user.json
+++ b/snappymail/v/0.0.0/app/localization/id-ID/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Polos",
 		"LABEL_VIEW_OPTIONS": "Tampilkan Opsi",
 		"LABEL_USE_PREVIEW_PANE": "Gunakan panel pratinjau",
+		"HIDE_DELETED_MESSAGES": "Sembunyikan pesan yang ditandai untuk dihapus",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Tampilkan centang dalam daftar",
 		"LABEL_USE_THREADS": "Gunakan tread",
 		"LABEL_REPLY_SAME_FOLDER": "Tempatkan pesan balasan di folder pesan yang dibalas",
--- a/snappymail/v/0.0.0/app/localization/is-IS/user.json
+++ b/snappymail/v/0.0.0/app/localization/is-IS/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Venjulegt",
 		"LABEL_VIEW_OPTIONS": "Valkostir skoðunar",
 		"LABEL_USE_PREVIEW_PANE": "Nota forskoðunarham",
+		"HIDE_DELETED_MESSAGES": "Fela skilaboð merkt til eyðingar",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Sýna valkassa í listanum",
 		"LABEL_USE_THREADS": "Nota þræði",
 		"LABEL_REPLY_SAME_FOLDER": "Setja svör í möppu skilaboðanna sem er verið að svara",
--- a/snappymail/v/0.0.0/app/localization/it-IT/user.json
+++ b/snappymail/v/0.0.0/app/localization/it-IT/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Testo semplice",
 		"LABEL_VIEW_OPTIONS": "Impostazioni di visualizzazione",
 		"LABEL_USE_PREVIEW_PANE": "Mostra l'anteprima del messaggio",
+		"HIDE_DELETED_MESSAGES": "Nascondi i messaggi contrassegnati per l'eliminazione",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Mostra le caselle di spunta nella lista",
 		"LABEL_USE_THREADS": "Usa le conversazioni",
 		"LABEL_REPLY_SAME_FOLDER": "Posiziona le risposte nella cartella del messaggio a cui si è risposto",
--- a/snappymail/v/0.0.0/app/localization/ja-JP/user.json
+++ b/snappymail/v/0.0.0/app/localization/ja-JP/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "プレーンテキスト",
 		"LABEL_VIEW_OPTIONS": "表示",
 		"LABEL_USE_PREVIEW_PANE": "プレビューペインを使用する",
+		"HIDE_DELETED_MESSAGES": "削除のマークが付いたメッセージを非表示にする",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "リストにチェックボックスを表示",
 		"LABEL_USE_THREADS": "スレッドを使う",
 		"LABEL_REPLY_SAME_FOLDER": "返信したメッセージのフォルダに送信メールを置く",
--- a/snappymail/v/0.0.0/app/localization/ko-KR/user.json
+++ b/snappymail/v/0.0.0/app/localization/ko-KR/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "평문",
 		"LABEL_VIEW_OPTIONS": "보기 옵션",
 		"LABEL_USE_PREVIEW_PANE": "미리보기 창 사용",
+		"HIDE_DELETED_MESSAGES": "삭제 표시된 메시지 숨기기",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "목록에서 확인상자 표시",
 		"LABEL_USE_THREADS": "대화형 목록 사용",
 		"LABEL_REPLY_SAME_FOLDER": "회신 메시지를 원본과 동일한 폴더 위치에 저장",
--- a/snappymail/v/0.0.0/app/localization/lt-LT/user.json
+++ b/snappymail/v/0.0.0/app/localization/lt-LT/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Paprastas",
 		"LABEL_VIEW_OPTIONS": "Peržiūros parinktys",
 		"LABEL_USE_PREVIEW_PANE": "Naudokite peržiūros sritį",
+		"HIDE_DELETED_MESSAGES": "Slėpti pranešimus, pažymėtus ištrinti",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Rodyti žymėjimo langelius sąraše",
 		"LABEL_USE_THREADS": "Naudoti gijas",
 		"LABEL_REPLY_SAME_FOLDER": "Atsakymus dėti į katalogą, kuriame yra pradinė žinutė",
--- a/snappymail/v/0.0.0/app/localization/lv-LV/user.json
+++ b/snappymail/v/0.0.0/app/localization/lv-LV/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Teksts",
 		"LABEL_VIEW_OPTIONS": "Apskates opcijas",
 		"LABEL_USE_PREVIEW_PANE": "Lietot priekšskatu",
+		"HIDE_DELETED_MESSAGES": "Slēpt ziņojumus, kas atzīmēti dzēšanai",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Rādīt checkboxes sarakstā",
 		"LABEL_USE_THREADS": "Lietot saraksti",
 		"LABEL_REPLY_SAME_FOLDER": "Atbildes ziņojumus ielikt mapē kurā atrodas vēstule uz kuru tiek atbildēts.",
--- a/snappymail/v/0.0.0/app/localization/nb-NO/user.json
+++ b/snappymail/v/0.0.0/app/localization/nb-NO/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Ren tekst",
 		"LABEL_VIEW_OPTIONS": "Vis valg",
 		"LABEL_USE_PREVIEW_PANE": "Bruk forhåndsvisningsrute",
+		"HIDE_DELETED_MESSAGES": "Skjul meldinger som er merket for sletting",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Vis avkrysningsbokser i liste",
 		"LABEL_USE_THREADS": "Bruk tråder",
 		"LABEL_REPLY_SAME_FOLDER": "Legg svar i samme mappe som opprinnelig melding",
--- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Platte tekst",
 		"LABEL_VIEW_OPTIONS": "Bekijk opties",
 		"LABEL_USE_PREVIEW_PANE": "Toon leesvenster",
+		"HIDE_DELETED_MESSAGES": "Berichten verbergen die zijn gemarkeerd voor verwijdering",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Toon selectievakjes in de lijst",
 		"LABEL_USE_THREADS": "Groepeer berichten",
 		"LABEL_REPLY_SAME_FOLDER": "Plaats antwoorden in de map van het originele bericht",
--- a/snappymail/v/0.0.0/app/localization/pl-PL/user.json
+++ b/snappymail/v/0.0.0/app/localization/pl-PL/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "zwykły tekst",
 		"LABEL_VIEW_OPTIONS": "Opcje wyświetlania",
 		"LABEL_USE_PREVIEW_PANE": "Wyświetl okno podglądu",
+		"HIDE_DELETED_MESSAGES": "Ukryj wiadomości oznaczone do usunięcia",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Pokazuj pola zaznaczenia na listach",
 		"LABEL_USE_THREADS": "Używaj wątków",
 		"LABEL_REPLY_SAME_FOLDER": "Umieść odpowiedzi w folderach, z których pochodzą wiadomości",
--- a/snappymail/v/0.0.0/app/localization/pt-BR/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Texto Simples",
 		"LABEL_VIEW_OPTIONS": "Opções de Visualização",
 		"LABEL_USE_PREVIEW_PANE": "Usar painel de pré-visualização",
+		"HIDE_DELETED_MESSAGES": "Ocultar mensagens marcadas para exclusão",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Exibir caixas de seleção na lista",
 		"LABEL_USE_THREADS": "Agrupar mensagens por conversa",
 		"LABEL_REPLY_SAME_FOLDER": "Colocar resposta na mesma pasta da mensagem respondida",
--- a/snappymail/v/0.0.0/app/localization/pt-PT/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Texto simples",
 		"LABEL_VIEW_OPTIONS": "Ver opções",
 		"LABEL_USE_PREVIEW_PANE": "Use o painel de pré-visualização",
+		"HIDE_DELETED_MESSAGES": "Ocultar mensagens marcadas para exclusão",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Apresentar caixas de seleção na lista",
 		"LABEL_USE_THREADS": "Usar tópicos de conversa",
 		"LABEL_REPLY_SAME_FOLDER": "Colocar respostas na pasta das mensagens a que responde",
--- a/snappymail/v/0.0.0/app/localization/pt/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Texto simples",
 		"LABEL_VIEW_OPTIONS": "Ver opções",
 		"LABEL_USE_PREVIEW_PANE": "Use o painel de pré-visualização",
+		"HIDE_DELETED_MESSAGES": "Ocultar mensagens marcadas para exclusão",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Apresentar caixas de seleção na lista",
 		"LABEL_USE_THREADS": "Usar tópicos de conversa",
 		"LABEL_REPLY_SAME_FOLDER": "Colocar respostas na pasta das mensagens a que responde",
--- a/snappymail/v/0.0.0/app/localization/ro-RO/user.json
+++ b/snappymail/v/0.0.0/app/localization/ro-RO/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Simplu",
 		"LABEL_VIEW_OPTIONS": "Afișare",
 		"LABEL_USE_PREVIEW_PANE": "Folosiți un mod de afișare cu trei coloane",
+		"HIDE_DELETED_MESSAGES": "Ascunde mesajele marcate pentru ștergere",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Afișează listele checkbox",
 		"LABEL_USE_THREADS": "Minimizează scrisorile",
 		"LABEL_REPLY_SAME_FOLDER": "Răspunsurile în același folder cu originalul",
--- a/snappymail/v/0.0.0/app/localization/ru-RU/user.json
+++ b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Простой",
 		"LABEL_VIEW_OPTIONS": "Отображение",
 		"LABEL_USE_PREVIEW_PANE": "Использовать трехколоночный режим отображения",
+		"HIDE_DELETED_MESSAGES": "Скрыть сообщения, помеченные для удаления",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Показывать чекбоксы в списках",
 		"LABEL_USE_THREADS": "Сворачивать письма в переписках",
 		"LABEL_REPLY_SAME_FOLDER": "Помещать ответы в ту же папку, где находится оригинал",
--- a/snappymail/v/0.0.0/app/localization/sk-SK/user.json
+++ b/snappymail/v/0.0.0/app/localization/sk-SK/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Text",
 		"LABEL_VIEW_OPTIONS": "Možnosti zobrazenia",
 		"LABEL_USE_PREVIEW_PANE": "Používať panel rýchleho zobrazenia",
+		"HIDE_DELETED_MESSAGES": "Skryť správy označené na odstránenie",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Zobrazenie zaštkrtávacích políčok v zozname",
 		"LABEL_USE_THREADS": "Zobraziť ako konverzácie",
 		"LABEL_REPLY_SAME_FOLDER": "Umiestňovať odpovede do priečinka so správou ktorej sa týkajú",
--- a/snappymail/v/0.0.0/app/localization/sl-SI/user.json
+++ b/snappymail/v/0.0.0/app/localization/sl-SI/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Navadno besedilo",
 		"LABEL_VIEW_OPTIONS": "Možnosti ogleda",
 		"LABEL_USE_PREVIEW_PANE": "Uporabi polje za predogled",
+		"HIDE_DELETED_MESSAGES": "Skrij sporočila, označena za brisanje",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Na seznamu pokaži kvadratke za izbor",
 		"LABEL_USE_THREADS": "Uporabi niti",
 		"LABEL_REPLY_SAME_FOLDER": "Shrani odgovore v mapo sporočila, na katerega se odgovarja",
--- a/snappymail/v/0.0.0/app/localization/sv-SE/user.json
+++ b/snappymail/v/0.0.0/app/localization/sv-SE/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Oformaterad text",
 		"LABEL_VIEW_OPTIONS": "Visa alternativ",
 		"LABEL_USE_PREVIEW_PANE": "Avänd förhandsgranskningsfönster",
+		"HIDE_DELETED_MESSAGES": "Dölj meddelanden som är markerade för radering",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Visa kryssrutor i listan",
 		"LABEL_USE_THREADS": "Använd trådar",
 		"LABEL_REPLY_SAME_FOLDER": "Placera svar i samma mapp som mottagna meddelandet",
--- a/snappymail/v/0.0.0/app/localization/tr-TR/user.json
+++ b/snappymail/v/0.0.0/app/localization/tr-TR/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Düz",
 		"LABEL_VIEW_OPTIONS": "Ayarları görüntüle",
 		"LABEL_USE_PREVIEW_PANE": "Önizleme bölmesini kullanın",
+		"HIDE_DELETED_MESSAGES": "Silinmek üzere işaretlenen mesajları gizle",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Listede ekran onay kutularını göster",
 		"LABEL_USE_THREADS": "Konuları kullanın",
 		"LABEL_REPLY_SAME_FOLDER": "Klasördeki cevapları mesajlarda göster",
--- a/snappymail/v/0.0.0/app/localization/uk-UA/user.json
+++ b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Простий",
 		"LABEL_VIEW_OPTIONS": "Відображення",
 		"LABEL_USE_PREVIEW_PANE": "Використовувати трьохколонний режим відображення",
+		"HIDE_DELETED_MESSAGES": "Приховати повідомлення, позначені для видалення",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Показувати чекбокси у списках",
 		"LABEL_USE_THREADS": "Згортати листи у листуваннях",
 		"LABEL_REPLY_SAME_FOLDER": "Поміщати відповіді в ту ж теку, де знаходиться оригінал",
--- a/snappymail/v/0.0.0/app/localization/vi-VN/user.json
+++ b/snappymail/v/0.0.0/app/localization/vi-VN/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Dạng chữ viết thường",
 		"LABEL_VIEW_OPTIONS": "Xem những lựa chọn",
 		"LABEL_USE_PREVIEW_PANE": "Dùng bảng xem trước thư",
+		"HIDE_DELETED_MESSAGES": "Ẩn các tin nhắn được đánh dấu để xóa",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "Hiển thị ô đánh dấu dưới dạng danh sách",
 		"LABEL_USE_THREADS": "Nối thư qua lại cùng một tiêu đề thành một chuỗi hội thoại",
 		"LABEL_REPLY_SAME_FOLDER": "Đặt thư phản hồi gửi đi vào chung thư mục của bức thư nhận được",
--- a/snappymail/v/0.0.0/app/localization/zh-CN/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "普通文本",
 		"LABEL_VIEW_OPTIONS": "视图选项",
 		"LABEL_USE_PREVIEW_PANE": "使用预览",
+		"HIDE_DELETED_MESSAGES": "隱藏標記為刪除的郵件",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "列表中显示多选框",
 		"LABEL_USE_THREADS": "使用对话",
 		"LABEL_REPLY_SAME_FOLDER": "将回复的邮件置于被回复的邮件所在的文件夹",
--- a/snappymail/v/0.0.0/app/localization/zh-TW/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
@ -392,6 +392,7 @@
 		"LABEL_EDITOR_PLAIN": "Plain",
 		"LABEL_VIEW_OPTIONS": "視圖選項",
 		"LABEL_USE_PREVIEW_PANE": "使用預覽",
+		"HIDE_DELETED_MESSAGES": "隐藏标记为删除的邮件",
 		"LABEL_USE_CHECKBOXES_IN_LIST": "清單中顯示多選框",
 		"LABEL_USE_THREADS": "使用對話",
 		"LABEL_REPLY_SAME_FOLDER": "將回復的郵件放置到其回復的郵件所在資料夾",
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
@ -47,6 +47,13 @@
 	</div>
 	<div class="control-group">
 		<div>
+			<div style="margin-bottom:20px;" data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/HIDE_DELETED_MESSAGES',
+					value: hideDeleted
+				}
+			}"></div>
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {