Added option to prefer HTML to plain text view.

2025-01-01 04:22:15 +08:00 · 2022-01-14 14:05:33 +01:00 · 2022-01-14 14:05:33 +01:00 · 7680372eda
commit 7680372eda
parent 8343e76d5f
41 changed files with 107 additions and 18 deletions
--- a/dev/Settings/User/General.js
+++ b/dev/Settings/User/General.js
@ -37,6 +37,7 @@ export class GeneralUserSettings /*extends AbstractViewSettings*/ {
 		this.enableDesktopNotification = NotificationUserStore.enableDesktopNotification;
 		this.isDesktopNotificationAllowed = NotificationUserStore.isDesktopNotificationAllowed;

+		this.viewHTML = SettingsUserStore.viewHTML;
 		this.showImages = SettingsUserStore.showImages;
 		this.removeColors = SettingsUserStore.removeColors;
 		this.useCheckboxesInList = SettingsUserStore.useCheckboxesInList;
@ -111,6 +112,7 @@ export class GeneralUserSettings /*extends AbstractViewSettings*/ {
 			messagesPerPage: value => Remote.saveSetting('MPP', value,
 				settingsSaveHelperSimpleFunction(this.mppTrigger, this)),

+			viewHTML: value => Remote.saveSetting('ViewHTML', value ? 1 : 0),
 			showImages: value => Remote.saveSetting('ShowImages', value ? 1 : 0),

 			removeColors: value => {
--- a/dev/Stores/User/Message.js
+++ b/dev/Stores/User/Message.js
@ -402,7 +402,7 @@ export const MessageUserStore = new class {
 						message.body = body;
 						message.fetchDataFromDom();
 					} else {
-						let isHtml = !!json.Html,
+						let isHtml = (SettingsUserStore.viewHTML() || !json.Plain) && !!json.Html,
 							resultHtml = '';
 						if (isHtml) {
 							resultHtml = json.Html.toString().replace(/font-size:\s*[0-9]px/g,'font-size:11px');
--- a/dev/Stores/User/Settings.js
+++ b/dev/Stores/User/Settings.js
@ -28,6 +28,7 @@ export const SettingsUserStore = new class {
 		self.messageReadDelay = ko.observable(5).extend({ debounce: 999 });

 		addObservablesTo(self, {
+			viewHTML: 1,
 			showImages: 0,
 			removeColors: 0,
 			useCheckboxesInList: 1,
@ -74,6 +75,7 @@ export const SettingsUserStore = new class {
 		self.messageReadDelay(pInt(SettingsGet('MessageReadDelay')));
 		self.autoLogout(pInt(SettingsGet('AutoLogout')));

+		self.viewHTML(SettingsGet('ViewHTML'));
 		self.showImages(SettingsGet('ShowImages'));
 		self.removeColors(SettingsGet('RemoveColors'));
 		self.useCheckboxesInList(SettingsGet('UseCheckboxesInList'));
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@ -722,6 +722,7 @@ class Actions
 			'UseLocalProxyForExternalImages' => (bool)$oConfig->Get('labs', 'use_local_proxy_for_external_images', false),

 			// user
+			'ViewHTML' => (bool) $oConfig->Get('defaults', 'view_html', true),
 			'ShowImages' => (bool) $oConfig->Get('defaults', 'show_images', false),
 			'RemoveColors' => (bool) $oConfig->Get('defaults', 'remove_colors', false),
 			'MessagesPerPage' => (int) $oConfig->Get('webmail', 'messages_per_page', 25),
@ -855,6 +856,7 @@ class Actions
 					}

 					$aResult['EditorDefaultType'] = (string)$oSettings->GetConf('EditorDefaultType', $aResult['EditorDefaultType']);
+					$aResult['ViewHTML'] = (bool)$oSettings->GetConf('ViewHTML', $aResult['ViewHTML']);
 					$aResult['ShowImages'] = (bool)$oSettings->GetConf('ShowImages', $aResult['ShowImages']);
 					$aResult['RemoveColors'] = (bool)$oSettings->GetConf('RemoveColors', $aResult['RemoveColors']);
 					$aResult['ContactsAutosave'] = (bool)$oSettings->GetConf('ContactsAutosave', $aResult['ContactsAutosave']);
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
@ -341,6 +341,7 @@ trait User
 		});

 		$this->setSettingsFromParams($oSettings, 'EditorDefaultType', 'string');
+		$this->setSettingsFromParams($oSettings, 'ViewHTML', 'bool');
 		$this->setSettingsFromParams($oSettings, 'ShowImages', 'bool');
 		$this->setSettingsFromParams($oSettings, 'RemoveColors', 'bool');
 		$this->setSettingsFromParams($oSettings, 'ContactsAutosave', 'bool');
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@ -236,6 +236,7 @@ Values:
 				'view_layout'            => array(1, 'layout: 0 - no preview, 1 - side preview, 2 - bottom preview'),
 				'view_use_checkboxes'    => array(true),
 				'autologout'             => array(30),
+				'view_html'              => array(true),
 				'show_images'            => array(false),
 				'contacts_autosave'      => array(true),
 				'mail_use_threads'       => array(false),
--- a/snappymail/v/0.0.0/app/localization/ar-SA/user.json
+++ b/snappymail/v/0.0.0/app/localization/ar-SA/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "إستخدام المواضيع",
 		"LABEL_REPLY_SAME_FOLDER": "ضع الردود في مجلد الرسالة التي يتم الرد عليها",
 		"LABEL_SHOW_IMAGES": "قم دائماَ بعرض الصور القادمة في الرسالة",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/bg-BG/user.json
+++ b/snappymail/v/0.0.0/app/localization/bg-BG/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Използвай групиране на съобщенията",
 		"LABEL_REPLY_SAME_FOLDER": "Постави отговорите с папката на отговаряното съобщение",
 		"LABEL_SHOW_IMAGES": "Винаги показвай външни картинки в текста на съобщението",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
+++ b/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Zobrazit jako konverzace",
 		"LABEL_REPLY_SAME_FOLDER": "Ukládat odpovědi do složky se zprávou, které se týkají",
 		"LABEL_SHOW_IMAGES": "Vždy zobrazovat obrázky v těle zprávy",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/da-DK/user.json
+++ b/snappymail/v/0.0.0/app/localization/da-DK/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Brug samtaler",
 		"LABEL_REPLY_SAME_FOLDER": "Placer svar i samme mappe som oprindelig meddelelse",
 		"LABEL_SHOW_IMAGES": "Vis altid eksterne billeder",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/de-DE/user.json
+++ b/snappymail/v/0.0.0/app/localization/de-DE/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Als Unterhaltungen anzeigen",
 		"LABEL_REPLY_SAME_FOLDER": "Antworten im gleichen Ordner wie die Nachricht, auf die geantwortet wurde, abspeichern",
 		"LABEL_SHOW_IMAGES": "In der Nachricht enthaltene Bilder immer anzeigen",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/el-GR/user.json
+++ b/snappymail/v/0.0.0/app/localization/el-GR/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Χρήση νημάτων",
 		"LABEL_REPLY_SAME_FOLDER": "Τοποθέτηση απαντήσεων στο φάκελο που ανήκει το μήνυμα που απαντάται",
 		"LABEL_SHOW_IMAGES": "Να εμφανίζονται πάντα οι εξωτερικές εικόνες στο σώμα του μηνύματος",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/en/user.json
+++ b/snappymail/v/0.0.0/app/localization/en/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Use threads",
 		"LABEL_REPLY_SAME_FOLDER": "Place replies in the folder of the message being replied to",
 		"LABEL_SHOW_IMAGES": "Always display external images in message body",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/es-ES/user.json
+++ b/snappymail/v/0.0.0/app/localization/es-ES/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Usar hilos de conversación",
 		"LABEL_REPLY_SAME_FOLDER": "Coloque las respuestas en la carpeta del mensaje que esta respondiendo.",
 		"LABEL_SHOW_IMAGES": "Mostrar siempre las imágenes en el cuerpo del mensaje",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/et-EE/user.json
+++ b/snappymail/v/0.0.0/app/localization/et-EE/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Kasuta vestluse lõimesid",
 		"LABEL_REPLY_SAME_FOLDER": "Pane vastused samasse kausta, kus asub vastatud kiri",
 		"LABEL_SHOW_IMAGES": "Näita alati kirja sisus viidatud väliseid pilte",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/fa-IR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fa-IR/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "استفاده از حالت موضوعی",
 		"LABEL_REPLY_SAME_FOLDER": " جوابها را در پوشه‌ای که پیامها در آن جواب داده شده است قراردهید",
 		"LABEL_SHOW_IMAGES": "همیشه تصاویر بیرونی را در بدنه پیام‌ها نشان بده",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/fi-FI/user.json
+++ b/snappymail/v/0.0.0/app/localization/fi-FI/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Käytä keskustelunäkymää",
 		"LABEL_REPLY_SAME_FOLDER": "Siirrä vastaukset samaan kansioon vastattavien kanssa",
 		"LABEL_SHOW_IMAGES": "Näytä aina ulkopuoliset kuvat viestissä",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/fr-FR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fr-FR/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Regrouper en conversations",
 		"LABEL_REPLY_SAME_FOLDER": "Placer les réponses dans le dossier du message",
 		"LABEL_SHOW_IMAGES": "Toujours afficher les images dans le mail",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/hu-HU/user.json
+++ b/snappymail/v/0.0.0/app/localization/hu-HU/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Szálak használata",
 		"LABEL_REPLY_SAME_FOLDER": "Válaszüzenetek elhelyezése az eredeti üzenet mappájában",
 		"LABEL_SHOW_IMAGES": "Mindig jelenítse meg a külső képeket az üzenet törzsében",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/id-ID/user.json
+++ b/snappymail/v/0.0.0/app/localization/id-ID/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Gunakan tread",
 		"LABEL_REPLY_SAME_FOLDER": "Tempatkan pesan balasan di folder pesan yang dibalas",
 		"LABEL_SHOW_IMAGES": "Selalu tampilkan gambar eksternal di dalam pesan",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/is-IS/user.json
+++ b/snappymail/v/0.0.0/app/localization/is-IS/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Nota þræði",
 		"LABEL_REPLY_SAME_FOLDER": "Setja svör í möppu skilaboðanna sem er verið að svara",
 		"LABEL_SHOW_IMAGES": "Sýna ávallt myndir í skilaboðum",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/it-IT/user.json
+++ b/snappymail/v/0.0.0/app/localization/it-IT/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Usa le conversazioni",
 		"LABEL_REPLY_SAME_FOLDER": "Posiziona le risposte nella cartella del messaggio a cui si è risposto",
 		"LABEL_SHOW_IMAGES": "Visualizza sempre le immagini esterne nel messaggio",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Messaggi per pagina",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
--- a/snappymail/v/0.0.0/app/localization/ja-JP/user.json
+++ b/snappymail/v/0.0.0/app/localization/ja-JP/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "スレッドを使う",
 		"LABEL_REPLY_SAME_FOLDER": "返信したメッセージのフォルダに送信メールを置く",
 		"LABEL_SHOW_IMAGES": "外部画像を常に表示する",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "1ページに表示する件数",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
--- a/snappymail/v/0.0.0/app/localization/ko-KR/user.json
+++ b/snappymail/v/0.0.0/app/localization/ko-KR/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "대화형 목록 사용",
 		"LABEL_REPLY_SAME_FOLDER": "회신 메시지를 원본과 동일한 폴더 위치에 저장",
 		"LABEL_SHOW_IMAGES": "메시지 본문에 포함된 외부 이미지를 항상 표시",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/lt-LT/user.json
+++ b/snappymail/v/0.0.0/app/localization/lt-LT/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Naudoti gijas",
 		"LABEL_REPLY_SAME_FOLDER": "Atsakymus dėti į katalogą, kuriame yra pradinė žinutė",
 		"LABEL_SHOW_IMAGES": "Visada rodyti išorinius vaizdus žinutėse",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/lv-LV/user.json
+++ b/snappymail/v/0.0.0/app/localization/lv-LV/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Lietot saraksti",
 		"LABEL_REPLY_SAME_FOLDER": "Atbildes ziņojumus ielikt mapē kurā atrodas vēstule uz kuru tiek atbildēts.",
 		"LABEL_SHOW_IMAGES": "Vienmēr rādīt attēlus ziņojumos",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/nb-NO/user.json
+++ b/snappymail/v/0.0.0/app/localization/nb-NO/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Bruk tråder",
 		"LABEL_REPLY_SAME_FOLDER": "Legg svar i samme mappe som opprinnelig melding",
 		"LABEL_SHOW_IMAGES": "Vis alltid eksterne bilder i meldingstekst",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
 		"LABEL_MESSAGE_PER_PAGE": "Meldinger per side",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
--- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Groepeer berichten",
 		"LABEL_REPLY_SAME_FOLDER": "Plaats antwoorden in de map van het originele bericht",
 		"LABEL_SHOW_IMAGES": "Afbeeldingen altijd weergeven in het bericht",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/pl-PL/user.json
+++ b/snappymail/v/0.0.0/app/localization/pl-PL/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Używaj wątków",
 		"LABEL_REPLY_SAME_FOLDER": "Umieść odpowiedzi w folderach, z których pochodzą wiadomości",
 		"LABEL_SHOW_IMAGES": "Zawsze wyświetlaj zewnętrzne obrazy w treści wiadomości",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/pt-BR/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Agrupar mensagens por conversa",
 		"LABEL_REPLY_SAME_FOLDER": "Colocar resposta na mesma pasta da mensagem respondida",
 		"LABEL_SHOW_IMAGES": "Sempre exibir imagens no corpo da mensagem",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/pt-PT/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Usar tópicos de conversa",
 		"LABEL_REPLY_SAME_FOLDER": "Colocar respostas na pasta das mensagens a que responde",
 		"LABEL_SHOW_IMAGES": "Apresentar sempre as imagens no corpo da mensagem",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/ro-RO/user.json
+++ b/snappymail/v/0.0.0/app/localization/ro-RO/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Minimizează scrisorile",
 		"LABEL_REPLY_SAME_FOLDER": "Răspunsurile în același folder cu originalul",
 		"LABEL_SHOW_IMAGES": "Arată imaginile externe în corpul mesajului, fără avertisment",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/ru-RU/user.json
+++ b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Сворачивать письма в переписках",
 		"LABEL_REPLY_SAME_FOLDER": "Помещать ответы в ту же папку, где находится оригинал",
 		"LABEL_SHOW_IMAGES": "Показывать внешние изображения в теле письма без предупреждения",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/sk-SK/user.json
+++ b/snappymail/v/0.0.0/app/localization/sk-SK/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Zobraziť ako konverzácie",
 		"LABEL_REPLY_SAME_FOLDER": "Umiestňovať odpovede do priečinka so správou ktorej sa týkajú",
 		"LABEL_SHOW_IMAGES": "Vždy zobrazovať obrázky v tele správy",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/sl-SI/user.json
+++ b/snappymail/v/0.0.0/app/localization/sl-SI/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Uporabi niti",
 		"LABEL_REPLY_SAME_FOLDER": "Shrani odgovore v mapo sporočila, na katerega se odgovarja",
 		"LABEL_SHOW_IMAGES": "Vedno prikaži zunanje slike v telesu sporočila",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/sv-SE/user.json
+++ b/snappymail/v/0.0.0/app/localization/sv-SE/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Använd trådar",
 		"LABEL_REPLY_SAME_FOLDER": "Placera svar i samma mapp som mottagna meddelandet",
 		"LABEL_SHOW_IMAGES": "Visa alltid bilder i mail",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/tr-TR/user.json
+++ b/snappymail/v/0.0.0/app/localization/tr-TR/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Konuları kullanın",
 		"LABEL_REPLY_SAME_FOLDER": "Klasördeki cevapları mesajlarda göster",
 		"LABEL_SHOW_IMAGES": "Herzaman gelen maillerdeki resimleri görüntüle.",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/uk-UA/user.json
+++ b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "Згортати листи у листуваннях",
 		"LABEL_REPLY_SAME_FOLDER": "Поміщати відповіді в ту ж теку, де знаходиться оригінал",
 		"LABEL_SHOW_IMAGES": "Показувати зовнішні зображення в тілі листа без попередження",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/localization/zh-CN/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-CN/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "使用对话",
 		"LABEL_REPLY_SAME_FOLDER": "将回复的邮件置于被回复的邮件所在的文件夹",
 		"LABEL_SHOW_IMAGES": "总是显示外部图片信息",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"LABEL_REMOVE_COLORS": "从消息中删除背景和文本颜色",
 		"LABEL_MESSAGE_PER_PAGE": "封邮件每页",
 		"LABEL_MARK_MESSAGE_READ_AFTER": "将消息标记为已读",
--- a/snappymail/v/0.0.0/app/localization/zh-TW/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
@ -396,6 +396,8 @@
 		"LABEL_USE_THREADS": "使用對話",
 		"LABEL_REPLY_SAME_FOLDER": "將回復的郵件放置到其回復的郵件所在資料夾",
 		"LABEL_SHOW_IMAGES": "總是顯示外部圖片資訊",
+		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
+		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
 		"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",
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
@ -45,6 +45,33 @@
 			<span data-bind="saveTrigger: mppTrigger"></span>
 		</div>
 	</div>
+	<div class="control-group">
+		<div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/LABEL_USE_CHECKBOXES_IN_LIST',
+					value: useCheckboxesInList
+				}
+			}"></div>
+			<div data-bind="visible: threadsAllowed, component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/LABEL_USE_THREADS',
+					value: useThreads
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/LABEL_REPLY_SAME_FOLDER',
+					value: replySameFolder
+				}
+			}"></div>
+		</div>
+	</div>
+
+	<div class="legend" data-i18n="SETTINGS_GENERAL/LEGEND_MESSAGE"></div>
 	<div class="control-group">
 		<label data-i18n="SETTINGS_GENERAL/LABEL_MARK_MESSAGE_READ_AFTER"></label>
 		<div>
@ -73,25 +100,11 @@
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
-					label: 'SETTINGS_GENERAL/LABEL_USE_CHECKBOXES_IN_LIST',
-					value: useCheckboxesInList
-				}
-			}"></div>
-			<br />
-			<div data-bind="visible: threadsAllowed, component: {
-				name: 'Checkbox',
-				params: {
-					label: 'SETTINGS_GENERAL/LABEL_USE_THREADS',
-					value: useThreads
-				}
-			}"></div>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'SETTINGS_GENERAL/LABEL_REPLY_SAME_FOLDER',
-					value: replySameFolder
+					label: 'SETTINGS_GENERAL/LABEL_PREFER_HTML',
+					value: viewHTML
 				}
 			}"></div>
+			<em style="margin: 0 0 1em 2em;display: block;" data-i18n="SETTINGS_GENERAL/LABEL_PREFER_HTML_INFO"></em>
 		</div>
 	</div>