Resolve #968

dev/Settings/User/General.js

@@ -45,7 +45,8 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 		 'editorDefaultType', 'requestReadReceipt', 'requestDsn', 'requireTLS', 'pgpSign', 'pgpEncrypt',
 		 'viewHTML', 'viewImages', 'viewImagesWhitelist', 'removeColors', 'allowStyles', 'allowDraftAutosave',
 		 'hideDeleted', 'listInlineAttachments', 'simpleAttachmentsList', 'collapseBlockquotes', 'maxBlockquotesLevel',
-		 'useCheckboxesInList', 'listGrouped', 'useThreads', 'replySameFolder', 'msgDefaultAction', 'allowSpellcheck'
+		 'useCheckboxesInList', 'listGrouped', 'useThreads', 'replySameFolder', 'msgDefaultAction', 'allowSpellcheck',
+		 'showNextMessage'
 		].forEach(name => this[name] = SettingsUserStore[name]);
 
 		this.allowLanguagesOnSettings = !!SettingsGet('allowLanguagesOnSettings');
@@ -104,7 +105,7 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 		this.addSettings(['ViewHTML', 'ViewImages', 'ViewImagesWhitelist', 'HideDeleted', 'RemoveColors', 'AllowStyles',
 			'ListInlineAttachments', 'simpleAttachmentsList', 'UseCheckboxesInList', 'listGrouped', 'ReplySameFolder',
 			'requestReadReceipt', 'requestDsn', 'requireTLS', 'pgpSign', 'pgpEncrypt', 'allowSpellcheck',
-			'DesktopNotifications', 'SoundNotification', 'CollapseBlockquotes', 'AllowDraftAutosave']);
+			'DesktopNotifications', 'SoundNotification', 'CollapseBlockquotes', 'AllowDraftAutosave', 'showNextMessage']);
 
 		const fReloadLanguageHelper = (saveSettingsStep) => () => {
 				this.languageTrigger(saveSettingsStep);

dev/Stores/User/Messagelist.js

@@ -3,7 +3,7 @@ import { koComputable, addObservablesTo, addComputablesTo } from 'External/ko';
 import { SMAudio } from 'Common/Audio';
 import { Notifications } from 'Common/Enums';
 import { MessageSetAction } from 'Common/EnumsUser';
-import { $htmlCL } from 'Common/Globals';
+import { $htmlCL, fireEvent } from 'Common/Globals';
 import { arrayLength, pString } from 'Common/Utils';
 import { UNUSED_OPTION_VALUE } from 'Common/Consts';
 
@@ -413,6 +413,18 @@ MessagelistUserStore.removeMessagesFromList = (
 		} else {
 			MessagelistUserStore.isIncomplete(true);
 
+			// Select next email https://github.com/the-djmaze/snappymail/issues/968
+			if (currentMessage && 1 == messages.length && SettingsUserStore.showNextMessage()) {
+				let next = MessagelistUserStore.indexOf(currentMessage) + 1;
+				if (0 < next && (next = MessagelistUserStore()[next])) {
+					currentMessage = null;
+					fireEvent('mailbox.message.show', {
+						folder: next.folder,
+						uid: next.uid
+					});
+				}
+			}
+
 			messages.forEach(item => {
 				if (currentMessage && currentMessage.hash === item.hash) {
 					currentMessage = null;

dev/Stores/User/Settings.js

@@ -26,6 +26,7 @@ export const SettingsUserStore = new class {
 			simpleAttachmentsList: 0,
 			useCheckboxesInList: 1,
 			listGrouped: 0,
+			showNextMessage: 0,
 			allowDraftAutosave: 1,
 			useThreads: 0,
 			replySameFolder: 0,
@@ -95,6 +96,7 @@ export const SettingsUserStore = new class {
 		self.simpleAttachmentsList(SettingsGet('simpleAttachmentsList'));
 		self.useCheckboxesInList(SettingsGet('UseCheckboxesInList'));
 		self.listGrouped(SettingsGet('listGrouped'));
+		self.showNextMessage(SettingsGet('showNextMessage'));
 		self.allowDraftAutosave(SettingsGet('AllowDraftAutosave'));
 		self.useThreads(SettingsGet('UseThreads'));
 		self.replySameFolder(SettingsGet('ReplySameFolder'));

snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php

@@ -703,6 +703,7 @@ class Actions
 					'Layout' => (int) $oConfig->Get('defaults', 'view_layout', Enumerations\Layout::SIDE_PREVIEW),
 					'EditorDefaultType' => \str_replace('Forced', '', $oConfig->Get('defaults', 'view_editor_type', '')),
 					'UseCheckboxesInList' => (bool) $oConfig->Get('defaults', 'view_use_checkboxes', true),
+					'showNextMessage' => false,
 					'AutoLogout' => (int) $oConfig->Get('defaults', 'autologout', 30),
 					'UseThreads' => (bool) $oConfig->Get('defaults', 'mail_use_threads', false),
 					'AllowDraftAutosave' => (bool) $oConfig->Get('defaults', 'allow_draft_autosave', true),
@@ -828,6 +829,7 @@ class Actions
 					$aResult['NotificationSound'] = (string)$oSettings->GetConf('NotificationSound', $aResult['NotificationSound']);
 					$aResult['DesktopNotifications'] = (bool)$oSettings->GetConf('DesktopNotifications', $aResult['DesktopNotifications']);
 					$aResult['UseCheckboxesInList'] = (bool)$oSettings->GetConf('UseCheckboxesInList', $aResult['UseCheckboxesInList']);
+					$aResult['showNextMessage'] = (bool)$oSettings->GetConf('showNextMessage', $aResult['showNextMessage']);
 					$aResult['AllowDraftAutosave'] = (bool)$oSettings->GetConf('AllowDraftAutosave', $aResult['AllowDraftAutosave']);
 					$aResult['AutoLogout'] = (int)$oSettings->GetConf('AutoLogout', $aResult['AutoLogout']);
 					$aResult['Layout'] = (int)$oSettings->GetConf('Layout', $aResult['Layout']);

snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php

@@ -201,6 +201,7 @@ trait User
 		$this->setSettingsFromParams($oSettings, 'AutoLogout', 'int');
 		$this->setSettingsFromParams($oSettings, 'MessageReadDelay', 'int');
 		$this->setSettingsFromParams($oSettings, 'MsgDefaultAction', 'int');
+		$this->setSettingsFromParams($oSettings, 'showNextMessage', 'bool');
 
 		$this->setSettingsFromParams($oSettings, 'Resizer4Width', 'int');
 		$this->setSettingsFromParams($oSettings, 'Resizer5Width', 'int');

snappymail/v/0.0.0/app/localization/ar-SA/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "بدون إنقسام",
 		"LAYOUT_VERTICAL_SPLIT": "إنقسام عمودي",
 		"LAYOUT_HORIZONTAL_SPLIT": "إنقسام أفقي",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "المحرر النصي الأساسي",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "عادي",

snappymail/v/0.0.0/app/localization/bg-BG/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Не разделяй",
 		"LAYOUT_VERTICAL_SPLIT": "Вертикално разделяне",
 		"LAYOUT_HORIZONTAL_SPLIT": "Хоризонтално разделяне",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Текстов редактор по подразбиране",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Чист текст",

snappymail/v/0.0.0/app/localization/cs-CZ/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Nerozdělovat",
 		"LAYOUT_VERTICAL_SPLIT": "Vertikální rozdělení",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontální rozdělení",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Přednastavený editor zpráv",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Text",

snappymail/v/0.0.0/app/localization/da-DK/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Del ikke",
 		"LAYOUT_VERTICAL_SPLIT": "Del lodret",
 		"LAYOUT_HORIZONTAL_SPLIT": "Del vandret",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Standard tekst program",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Plain",

snappymail/v/0.0.0/app/localization/de-DE/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Keine Aufteilung",
 		"LAYOUT_VERTICAL_SPLIT": "Vertikale Aufteilung",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontale Aufteilung",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Standard-Texteditor",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Unformatierter Text",

snappymail/v/0.0.0/app/localization/el-GR/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Χωρίς χώρισμα",
 		"LAYOUT_VERTICAL_SPLIT": "Κάθετο χώρισμα",
 		"LAYOUT_HORIZONTAL_SPLIT": "Οριζόντιο χώρισμα",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Προεπιλεγμένος συντάκτης κειμένου",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Απλό",

snappymail/v/0.0.0/app/localization/en-GB/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "No Split",
 		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Default text editor",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Plain",

snappymail/v/0.0.0/app/localization/en/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "No Split",
 		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Default text editor",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Plain",

snappymail/v/0.0.0/app/localization/es-ES/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Sin División",
 		"LAYOUT_VERTICAL_SPLIT": "División Vertical",
 		"LAYOUT_HORIZONTAL_SPLIT": "División Horizontal",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Editor de texto predeterminado",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Texto plano",

snappymail/v/0.0.0/app/localization/et-EE/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Jaotuseta",
 		"LAYOUT_VERTICAL_SPLIT": "Vertikaalse jaotusega",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horisontaalse jaotusega",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Vaikimisi tekstiredaktor",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Lihttekst",

snappymail/v/0.0.0/app/localization/eu/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Zatitu gabe",
 		"LAYOUT_VERTICAL_SPLIT": "Zatiketa bertikala",
 		"LAYOUT_HORIZONTAL_SPLIT": "Zatiketa horizontala",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Berezko testu editorea",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Formaturik gabea",

snappymail/v/0.0.0/app/localization/fa-IR/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "بدون تقسیم",
 		"LAYOUT_VERTICAL_SPLIT": "تقسیم عمودی",
 		"LAYOUT_HORIZONTAL_SPLIT": "تقسیم افقی",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "ویرایشگر پیش‌فرض",
 		"EDITOR_HTML": "تحت فرمت Html",
 		"EDITOR_PLAIN": "ساده",

snappymail/v/0.0.0/app/localization/fi-FI/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Ei jakoa",
 		"LAYOUT_VERTICAL_SPLIT": "Pystysuora jako",
 		"LAYOUT_HORIZONTAL_SPLIT": "Vaakataso jako",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Oletus tekstieditori",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Pelkkä teksti",

snappymail/v/0.0.0/app/localization/fr-FR/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Pas de séparation",
 		"LAYOUT_VERTICAL_SPLIT": "Séparation verticale",
 		"LAYOUT_HORIZONTAL_SPLIT": "Séparation horizontale",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Éditeur de texte par défaut",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Non-formaté",

snappymail/v/0.0.0/app/localization/hu-HU/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Felosztás nélkül",
 		"LAYOUT_VERTICAL_SPLIT": "Függőleges felosztás",
 		"LAYOUT_HORIZONTAL_SPLIT": "Vízszintes felosztás",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Alapértelmezett szövegszerkesztő",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Egyszerű",

snappymail/v/0.0.0/app/localization/id-ID/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Tanpa pemisah",
 		"LAYOUT_VERTICAL_SPLIT": "Pemisah vertikal",
 		"LAYOUT_HORIZONTAL_SPLIT": "Pemisah horizontal",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Editor teks bawaan",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Polos",

snappymail/v/0.0.0/app/localization/is-IS/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Ekki klofið",
 		"LAYOUT_VERTICAL_SPLIT": "Klofið lóðrétt",
 		"LAYOUT_HORIZONTAL_SPLIT": "Klofið lárétt",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Sjálfgefinn textaritill",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Venjulegt",

snappymail/v/0.0.0/app/localization/it-IT/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "A pagina intera",
 		"LAYOUT_VERTICAL_SPLIT": "Divisione verticale",
 		"LAYOUT_HORIZONTAL_SPLIT": "Divisione orizzontale",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Editor di testo predefinito",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Testo semplice",

snappymail/v/0.0.0/app/localization/ja-JP/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "分割しない",
 		"LAYOUT_VERTICAL_SPLIT": "縦に分割",
 		"LAYOUT_HORIZONTAL_SPLIT": "横に分割",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "メール形式",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "プレーンテキスト",

snappymail/v/0.0.0/app/localization/ko-KR/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "분할 해제",
 		"LAYOUT_VERTICAL_SPLIT": "세로 분할",
 		"LAYOUT_HORIZONTAL_SPLIT": "가로 분할",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "기본 텍스트 편집기",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "평문",

snappymail/v/0.0.0/app/localization/lt-LT/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Skaidymo nėra",
 		"LAYOUT_VERTICAL_SPLIT": "Vertikalus skaidymas",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontalus skaidymas",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Numatytas teksto redaktorius",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Paprastas",

snappymail/v/0.0.0/app/localization/lv-LV/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "No Split",
 		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Galvenais teksta editors",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Teksts",

snappymail/v/0.0.0/app/localization/nb-NO/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Ingen deling",
 		"LAYOUT_VERTICAL_SPLIT": "Vertikal deling",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horisontal deling",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Standard tekstbehandler",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Ren tekst",

snappymail/v/0.0.0/app/localization/nl-NL/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Geen splitsing",
 		"LAYOUT_VERTICAL_SPLIT": "Verticale splitsing",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontale splitsing",
+		"SHOW_NEXT_MESSAGE": "Toon volgende bericht bij verplaatsen huidige bericht",
 		"EDITOR": "Standaard tekst editor",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Platte tekst",

snappymail/v/0.0.0/app/localization/pl-PL/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "bez podziału",
 		"LAYOUT_VERTICAL_SPLIT": "podział w pionie",
 		"LAYOUT_HORIZONTAL_SPLIT": "podział w poziomie",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Format wiadomości",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "zwykły tekst",

snappymail/v/0.0.0/app/localization/pt-BR/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Sem divisão",
 		"LAYOUT_VERTICAL_SPLIT": "Divisão Vertical",
 		"LAYOUT_HORIZONTAL_SPLIT": "Divisão Horizontal",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Editor de texto padrão",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Texto Simples",

snappymail/v/0.0.0/app/localization/pt-PT/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Sem separação",
 		"LAYOUT_VERTICAL_SPLIT": "Separação vertical",
 		"LAYOUT_HORIZONTAL_SPLIT": "Separação horizontal",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Editor de texto padrão",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Texto simples",

snappymail/v/0.0.0/app/localization/pt/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Sem separação",
 		"LAYOUT_VERTICAL_SPLIT": "Separação vertical",
 		"LAYOUT_HORIZONTAL_SPLIT": "Separação horizontal",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Editor de texto padrão",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Texto simples",

snappymail/v/0.0.0/app/localization/ro-RO/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "No Split",
 		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Editor de text implicit",
 		"EDITOR_HTML": "Formatat",
 		"EDITOR_PLAIN": "Simplu",

snappymail/v/0.0.0/app/localization/ru-RU/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Одна панель",
 		"LAYOUT_VERTICAL_SPLIT": "Вертикальные панели",
 		"LAYOUT_HORIZONTAL_SPLIT": "Горизонтальные панели",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Редактор текста по умолчанию",
 		"EDITOR_HTML": "Форматированный",
 		"EDITOR_PLAIN": "Простой",

snappymail/v/0.0.0/app/localization/sk-SK/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "No Split",
 		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Predvolený editor správ",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Text",

snappymail/v/0.0.0/app/localization/sl-SI/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Brez razdelitve",
 		"LAYOUT_VERTICAL_SPLIT": "Navpično razdeljeno",
 		"LAYOUT_HORIZONTAL_SPLIT": "Vodoravno razdeljeno",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Privzeta vrsta besedila",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Navadno besedilo",

snappymail/v/0.0.0/app/localization/sv-SE/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Utan delad vy",
 		"LAYOUT_VERTICAL_SPLIT": "Vertikalt delad vy",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horisontellt delad vy",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Textredigerare",
 		"EDITOR_HTML": "HTML",
 		"EDITOR_PLAIN": "Oformaterad text",

snappymail/v/0.0.0/app/localization/tr-TR/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "No Split",
 		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Varsayılan text editör",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Düz",

snappymail/v/0.0.0/app/localization/uk-UA/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "No Split",
 		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Редактор тексту за змовчуванням",
 		"EDITOR_HTML": "Форматований",
 		"EDITOR_PLAIN": "Простий",

snappymail/v/0.0.0/app/localization/vi-VN/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "Không phân màn hình",
 		"LAYOUT_VERTICAL_SPLIT": "Phân dọc màn hình",
 		"LAYOUT_HORIZONTAL_SPLIT": "Phân ngang màn hình",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "Chỉnh dạng văn bản mặc định",
 		"EDITOR_HTML": "Dạng Html",
 		"EDITOR_PLAIN": "Dạng chữ viết thường",

snappymail/v/0.0.0/app/localization/zh-CN/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "不分隔",
 		"LAYOUT_VERTICAL_SPLIT": "垂直分隔",
 		"LAYOUT_HORIZONTAL_SPLIT": "水平分隔",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "默认文本编辑器",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "纯文本",

snappymail/v/0.0.0/app/localization/zh-TW/user.json

@@ -389,6 +389,7 @@
 		"LAYOUT_NO_SPLIT": "No Split",
 		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
 		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
 		"EDITOR": "默認格式",
 		"EDITOR_HTML": "Html",
 		"EDITOR_PLAIN": "Plain",

snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html

@@ -36,14 +36,6 @@
 			}
 		}"></div>
 	</div>
-	<div class="control-group">
-		<label data-i18n="SETTINGS_GENERAL/MESSAGE_PER_PAGE"></label>
-		<div>
-			<input type="number" min="10" max="50" step="1" class="span1" data-bind="textInput: messagesPerPage">
-			&nbsp;
-			<span data-bind="saveTrigger: messagesPerPageTrigger"></span>
-		</div>
-	</div>
 	<div class="control-group">
 		<label data-i18n="SETTINGS_GENERAL/CHECK_MAIL_INTERVAL"></label>
 		<div>
@@ -52,6 +44,34 @@
 			<span data-bind="saveTrigger: checkMailIntervalTrigger"></span>
 		</div>
 	</div>
+	<div class="control-group">
+		<div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/REPLY_SAME_FOLDER',
+					value: replySameFolder
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/SHOW_NEXT_MESSAGE',
+					value: showNextMessage
+				}
+			}"></div>
+		</div>
+	</div>
+
+	<div class="legend" data-i18n="SHORTCUTS_HELP/TAB_MESSAGE_LIST"></div>
+	<div class="control-group">
+		<label data-i18n="SETTINGS_GENERAL/MESSAGE_PER_PAGE"></label>
+		<div>
+			<input type="number" min="10" max="50" step="1" class="span1" data-bind="textInput: messagesPerPage">
+			&nbsp;
+			<span data-bind="saveTrigger: messagesPerPageTrigger"></span>
+		</div>
+	</div>
 	<div class="control-group">
 		<div>
 			<div data-bind="component: {
@@ -82,13 +102,6 @@
 					value: useThreads
 				}
 			}"></div>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'SETTINGS_GENERAL/REPLY_SAME_FOLDER',
-					value: replySameFolder
-				}
-			}"></div>
 		</div>
 	</div>