Resolve #496

dev/Common/EnumsUser.js

@@ -76,7 +76,6 @@ export const
 	ClientSideKeyNameExpandedFolders = 3,
 	ClientSideKeyNameFolderListSize = 4,
 	ClientSideKeyNameMessageListSize = 5,
-	ClientSideKeyNameLastReplyAction = 6,
 	ClientSideKeyNameLastSignMe = 7,
 	ClientSideKeyNameMessageHeaderFullInfo = 9,
 	ClientSideKeyNameMessageAttachmentControls = 10;

dev/Settings/User/General.js

@@ -43,7 +43,7 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 		['layout', 'messageReadDelay', 'messagesPerPage',
 		 'editorDefaultType', 'requestReadReceipt', 'requestDsn', 'pgpSign', 'pgpEncrypt',
 		 'viewHTML', 'showImages', 'removeColors', 'hideDeleted',
-		 'useCheckboxesInList', 'useThreads', 'replySameFolder'
+		 'useCheckboxesInList', 'useThreads', 'replySameFolder', 'msgDefaultAction'
 		].forEach(name => this[name] = SettingsUserStore[name]);
 
 		this.allowLanguagesOnSettings = !!SettingsGet('AllowLanguagesOnSettings');
@@ -73,6 +73,14 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 				];
 			},
 
+			msgDefaultActions: () => {
+				translatorTrigger();
+				return [
+					{ id: 1, name: i18n('MESSAGE/BUTTON_REPLY') }, // ComposeType.Reply,
+					{ id: 2, name: i18n('MESSAGE/BUTTON_REPLY_ALL') } // ComposeType.ReplyAll
+				];
+			},
+
 			layoutTypes: () => {
 				translatorTrigger();
 				return [
@@ -84,6 +92,7 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 		});
 
 		this.addSetting('EditorDefaultType');
+		this.addSetting('MsgDefaultAction');
 		this.addSetting('MessageReadDelay');
 		this.addSetting('MessagesPerPage');
 		this.addSetting('Layout', () => MessagelistUserStore([]));

dev/Stores/User/Settings.js

@@ -1,7 +1,7 @@
 import ko from 'ko';
 import { koComputable } from 'External/ko';
 
-import { Layout, EditorDefaultType } from 'Common/EnumsUser';
+import { Layout, EditorDefaultType, ComposeType } from 'Common/EnumsUser';
 import { pInt } from 'Common/Utils';
 import { addObservablesTo } from 'External/ko';
 import { $htmlCL, SettingsGet, fireEvent } from 'Common/Globals';
@@ -22,6 +22,13 @@ export const SettingsUserStore = new class {
 			]
 		});
 
+		self.msgDefaultAction = ko.observable(1).extend({
+			limitedList: [
+				ComposeType.Reply,
+				ComposeType.ReplyAll
+			]
+		});
+
 		self.messagesPerPage = ko.observable(25).extend({ debounce: 999 });
 
 		self.messageReadDelay = ko.observable(5).extend({ debounce: 999 });
@@ -79,6 +86,7 @@ export const SettingsUserStore = new class {
 		self.messagesPerPage(pInt(SettingsGet('MessagesPerPage')));
 		self.messageReadDelay(pInt(SettingsGet('MessageReadDelay')));
 		self.autoLogout(pInt(SettingsGet('AutoLogout')));
+		self.msgDefaultAction(SettingsGet('MsgDefaultAction'));
 
 		self.viewHTML(SettingsGet('ViewHTML'));
 		self.showImages(SettingsGet('ShowImages'));

dev/View/User/MailBox/MessageView.js

@@ -7,7 +7,6 @@ import { Scope } from 'Common/Enums';
 
 import {
 	ComposeType,
-	ClientSideKeyNameLastReplyAction,
 	ClientSideKeyNameMessageHeaderFullInfo,
 	ClientSideKeyNameMessageAttachmentControls,
 	FolderType,
@@ -94,10 +93,11 @@ export class MailMessageView extends AbstractViewRight {
 					}
 				}, this.messageVisibility);
 
+		this.msgDefaultAction = SettingsUserStore.msgDefaultAction;
+
 		this.addObservables({
 			showAttachmentControls: !!Local.get(ClientSideKeyNameMessageAttachmentControls),
 			downloadAsZipLoading: false,
-			lastReplyAction_: '',
 			showFullInfo: '1' === Local.get(ClientSideKeyNameMessageHeaderFullInfo),
 			moreDropdownTrigger: false,
 
@@ -138,15 +138,6 @@ export class MailMessageView extends AbstractViewRight {
 					.filter(item => item && !item.isLinked() && item.checked() && item.download)
 					.length,
 
-			lastReplyAction: {
-				read: this.lastReplyAction_,
-				write: value => this.lastReplyAction_(
-					[ComposeType.Reply, ComposeType.ReplyAll, ComposeType.Forward].includes(value)
-						? ComposeType.Reply
-						: value
-				)
-			},
-
 			tagsAllowed: () => FolderUserStore.currentFolder() ? FolderUserStore.currentFolder().tagsAllowed() : false,
 
 			messageVisibility: () => !MessageUserStore.loading() && !!currentMessage(),
@@ -182,8 +173,6 @@ export class MailMessageView extends AbstractViewRight {
 		});
 
 		this.addSubscribables({
-			lastReplyAction_: value => Local.set(ClientSideKeyNameLastReplyAction, value),
-
 			message: message => {
 				MessageUserStore.activeDom(null);
 
@@ -207,8 +196,6 @@ export class MailMessageView extends AbstractViewRight {
 			showFullInfo: value => Local.set(ClientSideKeyNameMessageHeaderFullInfo, value ? '1' : '0')
 		});
 
-		this.lastReplyAction(Local.get(ClientSideKeyNameLastReplyAction) || ComposeType.Reply);
-
 		// commands
 		this.replyCommand = createCommandReplyHelper(ComposeType.Reply);
 		this.replyAllCommand = createCommandReplyHelper(ComposeType.ReplyAll);
@@ -256,7 +243,6 @@ export class MailMessageView extends AbstractViewRight {
 	 * @returns {void}
 	 */
 	replyOrforward(sType) {
-		this.lastReplyAction(sType);
 		showMessageComposer([sType, currentMessage()]);
 	}
 

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

@@ -724,6 +724,7 @@ class Actions
 			'RemoveColors' => (bool) $oConfig->Get('defaults', 'remove_colors', false),
 			'MessagesPerPage' => (int) $oConfig->Get('webmail', 'messages_per_page', 25),
 			'MessageReadDelay' => (int) $oConfig->Get('webmail', 'message_read_delay', 5),
+			'MsgDefaultAction' => 1,
 			'SoundNotification' => true,
 			'NotificationSound' => 'new-mail',
 			'DesktopNotifications' => true,
@@ -862,6 +863,7 @@ class Actions
 					$aResult['ContactsAutosave'] = (bool)$oSettings->GetConf('ContactsAutosave', $aResult['ContactsAutosave']);
 					$aResult['MessagesPerPage'] = (int)$oSettings->GetConf('MessagesPerPage', $aResult['MessagesPerPage']);
 					$aResult['MessageReadDelay'] = (int)$oSettings->GetConf('MessageReadDelay', $aResult['MessageReadDelay']);
+					$aResult['MsgDefaultAction'] = (int)$oSettings->GetConf('MsgDefaultAction', $aResult['MsgDefaultAction']);
 					$aResult['SoundNotification'] = (bool)$oSettings->GetConf('SoundNotification', $aResult['SoundNotification']);
 					$aResult['NotificationSound'] = (string)$oSettings->GetConf('NotificationSound', $aResult['NotificationSound']);
 					$aResult['DesktopNotifications'] = (bool)$oSettings->GetConf('DesktopNotifications', $aResult['DesktopNotifications']);

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

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

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "الرسائل في الصفحة",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "التنبيهات",
 		"LABEL_SOUND_NOTIFICATION": "صوت التنبيهات",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Съобщения на страница",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Известия",
 		"LABEL_SOUND_NOTIFICATION": "Звуково известяване",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Zpráv na stranu",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Notifikace",
 		"LABEL_SOUND_NOTIFICATION": "Zvukové notifikace",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Meddelelser per side",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Notifikationer",
 		"LABEL_SOUND_NOTIFICATION": "Lyd notifikationer",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Entferne Hintergrund- und Textfarben aus der Nachricht",
 		"LABEL_MESSAGE_PER_PAGE": "Nachrichten pro Seite",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Nachricht als gelesen markieren nach",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "Sekunden",
 		"LABEL_NOTIFICATIONS": "Benachrichtigungen",
 		"LABEL_SOUND_NOTIFICATION": "Benachrichtigungston",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Μηνύματα στη σελίδα",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Επισημάνσεις",
 		"LABEL_SOUND_NOTIFICATION": "Ηχητική επισήμανση",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Messages on page",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Notifications",
 		"LABEL_SOUND_NOTIFICATION": "Sound notification",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Messages on page",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Notifications",
 		"LABEL_SOUND_NOTIFICATION": "Sound notification",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Eliminar el fondo y los colores del texto del mensaje",
 		"LABEL_MESSAGE_PER_PAGE": "Mensajes en página",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Marcar el mensaje como leído después de",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "segundos",
 		"LABEL_NOTIFICATIONS": "Notificaciones",
 		"LABEL_SOUND_NOTIFICATION": "Sonido de la notificación",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Lehel kuvatavate kirjade arv",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Teavitused",
 		"LABEL_SOUND_NOTIFICATION": "Teavitused heliga",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "پیام‌ها در صفحه",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "اطلاعیه‌ها",
 		"LABEL_SOUND_NOTIFICATION": "آگاه‌سازی با صدا",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Viestiä sivulla",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Ilmoitukset",
 		"LABEL_SOUND_NOTIFICATION": "Äänimerkit",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Supprimer les couleurs d'arrière-plan et de texte du message",
 		"LABEL_MESSAGE_PER_PAGE": "Messages par page",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Marquer le message comme lu après",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "secondes",
 		"LABEL_NOTIFICATIONS": "Notifications",
 		"LABEL_SOUND_NOTIFICATION": "Son de notification",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Üzenetek egy oldalon",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Jelölje meg az üzenetet olvasottként",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "másodperc után",
 		"LABEL_NOTIFICATIONS": "Értesítések",
 		"LABEL_SOUND_NOTIFICATION": "Hangos értesítés",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Pesan di halaman",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Notifikasi",
 		"LABEL_SOUND_NOTIFICATION": "Notifikasi suara",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Skilaboð á síðu",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Tilkynningar",
 		"LABEL_SOUND_NOTIFICATION": "Tilkynningarhljóð",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Rimuovi lo sfondo e i colori del testo dal messaggio",
 		"LABEL_MESSAGE_PER_PAGE": "Messaggi per pagina",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Contrassegna il messaggio come letto dopo",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Notifiche",
 		"LABEL_SOUND_NOTIFICATION": "Notifica sonora",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "本文の文字色及び背景色の設定を無視する",
 		"LABEL_MESSAGE_PER_PAGE": "1ページに表示する件数",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "メッセージが既読となるまでの秒数",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "秒",
 		"LABEL_NOTIFICATIONS": "通知設定",
 		"LABEL_SOUND_NOTIFICATION": "サウンド通知",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "페이지 당 메시지 개수",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "알림",
 		"LABEL_SOUND_NOTIFICATION": "소리 알림",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Žinučių lape",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Pranešimai",
 		"LABEL_SOUND_NOTIFICATION": "Garsinis pranešimas",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Ziņojumi lapā",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Paziņojumi",
 		"LABEL_SOUND_NOTIFICATION": "Sound notification",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Fjern bakgrunn og tekstfarger fra brødtekst",
 		"LABEL_MESSAGE_PER_PAGE": "Meldinger per side",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Marker melding som lest etter",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "sekunder",
 		"LABEL_NOTIFICATIONS": "Varsler",
 		"LABEL_SOUND_NOTIFICATION": "Lydvarsel",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Verwijder achtergrond- en tekstkleuren uit het bericht",
 		"LABEL_MESSAGE_PER_PAGE": "Berichten op pagina",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Bericht markeren als gelezen na",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconden",
 		"LABEL_NOTIFICATIONS": "Notificaties",
 		"LABEL_SOUND_NOTIFICATION": "Notificatie geluid",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Wiadomości na stronę",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Powiadomienia",
 		"LABEL_SOUND_NOTIFICATION": "Powiadomienia dźwiękowe",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Mensagens por Página",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Notificações",
 		"LABEL_SOUND_NOTIFICATION": "Notificação sonora",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Retirar imagens de fundo e coloração de texto do corpo das mensagens",
 		"LABEL_MESSAGE_PER_PAGE": "Mensagens por página",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Marcar mensagem como lida após",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "segundos",
 		"LABEL_NOTIFICATIONS": "Notificações",
 		"LABEL_SOUND_NOTIFICATION": "Notificações sonoras",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Retirar imagens de fundo e coloração de texto do corpo das mensagens",
 		"LABEL_MESSAGE_PER_PAGE": "Mensagens por página",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Marcar mensagem como lida após",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "segundos",
 		"LABEL_NOTIFICATIONS": "Notificações",
 		"LABEL_SOUND_NOTIFICATION": "Notificações sonoras",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Mesaje pe o pagină",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Notificări",
 		"LABEL_SOUND_NOTIFICATION": "Sound notification",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Cообщений на одной странице",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Уведомления",
 		"LABEL_SOUND_NOTIFICATION": "Звуковые уведомления",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Správ na stranu",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Notifikácie",
 		"LABEL_SOUND_NOTIFICATION": "Sound notification",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Sporočil na strani",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Obvestila",
 		"LABEL_SOUND_NOTIFICATION": "Zvočno obvestilo",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Meddelanden per sida",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Markera meddelandet som läst efter",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "sekunder",
 		"LABEL_NOTIFICATIONS": "Aviseringar",
 		"LABEL_SOUND_NOTIFICATION": "Ljudnotifikation",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Messages on page",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Bildirimler",
 		"LABEL_SOUND_NOTIFICATION": "Sound notification",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Повідомлень на одній сторінці",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "Сповіщення",
 		"LABEL_SOUND_NOTIFICATION": "Звукове сповіщення",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Loại bỏ hình nền và màu chữ trong phần thân của thư",
 		"LABEL_MESSAGE_PER_PAGE": "Số thư hiển thị trên trang",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Đánh dấu thư là để đọc sau",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "giây",
 		"LABEL_NOTIFICATIONS": "Thông báo",
 		"LABEL_SOUND_NOTIFICATION": "Thông báo âm thanh",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "从消息中删除背景和文本颜色",
 		"LABEL_MESSAGE_PER_PAGE": "封邮件每页",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "将消息标记为已读",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "秒",
 		"LABEL_NOTIFICATIONS": "通知",
 		"LABEL_SOUND_NOTIFICATION": "提示音",

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

@@ -403,6 +403,7 @@
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "封郵件每頁",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LABEL_MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
 		"LABEL_NOTIFICATIONS": "通知",
 		"LABEL_SOUND_NOTIFICATION": "Sound notification",

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

@@ -40,11 +40,9 @@
 				<div class="btn-group" style="margin-right: -8px; display: inline;">
 					<span data-bind="visible: canBeRepliedOrForwarded">
 						<a class="btn btn-thin btn-transparent buttonReply fontastic"
-							data-bind="visible: 1 == lastReplyAction(), command: replyCommand" data-i18n="[title]MESSAGE/BUTTON_REPLY">←</a>
+							data-bind="visible: 1 == msgDefaultAction(), command: replyCommand" data-i18n="[title]MESSAGE/BUTTON_REPLY">←</a>
 						<a class="btn btn-thin btn-transparent buttonReplyAll fontastic"
-							data-bind="visible: 2 == lastReplyAction(), command: replyAllCommand" data-i18n="[title]MESSAGE/BUTTON_REPLY_ALL">↞</a>
+							data-bind="visible: 2 == msgDefaultAction(), command: replyAllCommand" data-i18n="[title]MESSAGE/BUTTON_REPLY_ALL">↞</a>
-						<a class="btn btn-thin btn-transparent buttonForward fontastic"
-							data-bind="visible: 3 == lastReplyAction(), command: forwardCommand" data-i18n="[title]MESSAGE/BUTTON_FORWARD">→</a>
 					</span>
 					<div class="btn-group" data-bind="registerBootstrapDropdown: true" style="display: inline-block">
 						<a class="btn btn-thin btn-transparent dropdown-toggle fontastic" id="more-view-dropdown-id" href="#" tabindex="-1">☰</a>
@@ -66,7 +64,7 @@
 									<a href="#" tabindex="-1" data-bind="command: editAsNewCommand" data-icon="🖉" data-i18n="MESSAGE/BUTTON_EDIT_AS_NEW"></a>
 								</li>
 							</div>
-							<div data-bind="attr: { class: isDraftFolder() ? 'dividerbar' : ''}">
+							<div class="dividerbar">
 								<li role="presentation" data-bind="visible: !isDraftFolder() && !isArchiveFolder() && !isArchiveDisabled()">
 									<a href="#" tabindex="-1" data-bind="command: archiveCommand" data-icon="🗄" data-i18n="GLOBAL/TO_ARCHIVE"></a>
 								</li>

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

@@ -122,6 +122,19 @@
 			<span data-bind="saveTrigger: messageReadDelayTrigger"></span>
 		</div>
 	</div>
+	<div class="control-group">
+		<label data-i18n="SETTINGS_GENERAL/LABEL_MSG_DEFAULT_ACTION"></label>
+		<div data-bind="component: {
+			name: 'Select',
+			params: {
+				options: msgDefaultActions,
+				value: msgDefaultAction,
+				trigger: msgDefaultActionTrigger,
+				optionsText: 'name',
+				optionsValue: 'id'
+			}
+		}"></div>
+	</div>
 	<div class="control-group">
 		<div>
 			<div data-bind="component: {