diff --git a/dev/Common/Enums.js b/dev/Common/Enums.js
index 34c4db273..bf1521d29 100644
--- a/dev/Common/Enums.js
+++ b/dev/Common/Enums.js
@@ -217,8 +217,8 @@
 	Enums.EditorDefaultType = {
 		'Html': 'Html',
 		'Plain': 'Plain',
-		'HtmlForce': 'HtmlForce',
-		'PlainForce': 'PlainForce'
+		'HtmlForced': 'HtmlForced',
+		'PlainForced': 'PlainForced'
 	};
 
 	/**
diff --git a/dev/Settings/User/General.js b/dev/Settings/User/General.js
index f0a970a9a..2f1f1dc8e 100644
--- a/dev/Settings/User/General.js
+++ b/dev/Settings/User/General.js
@@ -57,17 +57,19 @@
 		}, this);
 
 		this.languageTrigger = ko.observable(Enums.SaveSettingsStep.Idle).extend({'throttle': 100});
+
 		this.mppTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
+		this.editorDefaultTypeTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
 
 		this.isAnimationSupported = Globals.bAnimationSupported;
 
 		this.editorDefaultTypes = ko.computed(function () {
 			Globals.langChangeTrigger();
 			return [
-				{'id': Enums.EditorDefaultType.Html, 'name': Utils.i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML_AS_DEFAULT')},
-				{'id': Enums.EditorDefaultType.Plain, 'name': Utils.i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN_AS_DEFAULT')},
-				{'id': Enums.EditorDefaultType.HtmlForce, 'name': Utils.i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML_FORCE_AS_DEFAULT')},
-				{'id': Enums.EditorDefaultType.PlainForce, 'name': Utils.i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT')}
+				{'id': Enums.EditorDefaultType.Html, 'name': Utils.i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML')},
+				{'id': Enums.EditorDefaultType.Plain, 'name': Utils.i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN')},
+				{'id': Enums.EditorDefaultType.HtmlForced, 'name': Utils.i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML_FORCED')},
+				{'id': Enums.EditorDefaultType.PlainForced, 'name': Utils.i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN_FORCED')}
 			];
 		}, this);
 	}
@@ -84,6 +86,7 @@
 		_.delay(function () {
 
 			var
+				f0 = Utils.settingsSaveHelperSimpleFunction(self.editorDefaultTypeTrigger, self),
 				f1 = Utils.settingsSaveHelperSimpleFunction(self.mppTrigger, self),
 				fReloadLanguageHelper = function (iSaveSettingsStep) {
 					return function() {
@@ -109,7 +112,7 @@
 			});
 
 			Data.editorDefaultType.subscribe(function (sValue) {
-				Remote.saveSettings(null, {
+				Remote.saveSettings(f0, {
 					'EditorDefaultType': sValue
 				});
 			});
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 7d47be8f7..ffa6d4855 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -921,8 +921,8 @@
 
 			this.editor(function (oEditor) {
 				oEditor.setHtml(sText, false);
-				if (Enums.EditorDefaultType.PlainForce === Data.editorDefaultType() ||
-					(!oMessage.isHtml() && Enums.EditorDefaultType.HtmlForce !== Data.editorDefaultType()))
+				if (Enums.EditorDefaultType.PlainForced === Data.editorDefaultType() ||
+					(!oMessage.isHtml() && Enums.EditorDefaultType.HtmlForced !== Data.editorDefaultType()))
 				{
 					oEditor.modeToggle(false);
 				}
@@ -942,7 +942,7 @@
 			this.editor(function (oEditor) {
 				oEditor.setHtml(sText, false);
 				if (Enums.EditorDefaultType.Html !== Data.editorDefaultType() &&
-					Enums.EditorDefaultType.HtmlForce !== Data.editorDefaultType())
+					Enums.EditorDefaultType.HtmlForced !== Data.editorDefaultType())
 				{
 					oEditor.modeToggle(false);
 				}
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
index c3b30c66c..668670b66 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
@@ -26,21 +26,12 @@
 			   <span class="i18n" data-i18n-text="SETTINGS_GENERAL/LABEL_EDITOR"></span>
 			</label>
 			<div class="controls">
-<!--				<div data-bind="component: {
-					name: 'Radio',
-					params: {
-						value: editorDefaultType,
-						values: {
-							'Html': 'SETTINGS_GENERAL/LABEL_EDITOR_HTML_AS_DEFAULT',
-							'Plain': 'SETTINGS_GENERAL/LABEL_EDITOR_PLAIN_AS_DEFAULT'
-						}
-					}
-				}"></div>-->
 				<div data-bind="component: {
 					name: 'Select',
 					params: {
 						options: editorDefaultTypes,
 						value: editorDefaultType,
+						trigger: editorDefaultTypeTrigger,
 						optionsText: 'name',
 						optionsValue: 'id'
 					}
diff --git a/rainloop/v/0.0.0/langs/bg.ini b/rainloop/v/0.0.0/langs/bg.ini
index 62cde9d13..08c14a0ba 100644
--- a/rainloop/v/0.0.0/langs/bg.ini
+++ b/rainloop/v/0.0.0/langs/bg.ini
@@ -394,10 +394,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica
 LEGEND_GENERAL = "Общи"
 LABEL_LANGUAGE = "Език"
 LABEL_EDITOR = "Текстов редактор по подразбиране"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Обикновен"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Html"
+LABEL_EDITOR_PLAIN = "Обикновен"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Interface animation"
 LABEL_ANIMATION_FULL = "Full"
 LABEL_ANIMATION_NORMAL = "Normal"
diff --git a/rainloop/v/0.0.0/langs/de.ini b/rainloop/v/0.0.0/langs/de.ini
index 7b78f5444..dc0595d5d 100644
--- a/rainloop/v/0.0.0/langs/de.ini
+++ b/rainloop/v/0.0.0/langs/de.ini
@@ -387,10 +387,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Wenn Sie keine Codes via Google Authenticator er
 LEGEND_GENERAL = "Allgemein"
 LABEL_LANGUAGE = "Sprache"
 LABEL_EDITOR = "Standard-Text-Editor"
-LABEL_EDITOR_HTML_AS_DEFAULT = "HTML"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Text"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "HTML"
+LABEL_EDITOR_PLAIN = "Text"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Interface-Animation"
 LABEL_ANIMATION_FULL = "Komplett"
 LABEL_ANIMATION_NORMAL = "Normal"
diff --git a/rainloop/v/0.0.0/langs/en.ini b/rainloop/v/0.0.0/langs/en.ini
index 6c6d12e3b..f66e8b54e 100644
--- a/rainloop/v/0.0.0/langs/en.ini
+++ b/rainloop/v/0.0.0/langs/en.ini
@@ -394,10 +394,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica
 LEGEND_GENERAL = "General"
 LABEL_LANGUAGE = "Language"
 LABEL_EDITOR = "Default text editor"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Plain"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Html"
+LABEL_EDITOR_PLAIN = "Plain"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Interface animation"
 LABEL_ANIMATION_FULL = "Full"
 LABEL_ANIMATION_NORMAL = "Normal"
diff --git a/rainloop/v/0.0.0/langs/es.ini b/rainloop/v/0.0.0/langs/es.ini
index 5bc54e4ec..e88bdb87c 100644
--- a/rainloop/v/0.0.0/langs/es.ini
+++ b/rainloop/v/0.0.0/langs/es.ini
@@ -386,10 +386,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Si usted no puede recibir los códigos a través
 LEGEND_GENERAL = "General"
 LABEL_LANGUAGE = "Idioma"
 LABEL_EDITOR = "Editor de texto predeterminado"
-LABEL_EDITOR_HTML_AS_DEFAULT = "HTML"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Texto plano"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "HTML"
+LABEL_EDITOR_PLAIN = "Texto plano"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Interface animation"
 LABEL_ANIMATION_FULL = "Todo"
 LABEL_ANIMATION_NORMAL = "Normal"
diff --git a/rainloop/v/0.0.0/langs/fr.ini b/rainloop/v/0.0.0/langs/fr.ini
index 2eed79a7b..c6894d576 100644
--- a/rainloop/v/0.0.0/langs/fr.ini
+++ b/rainloop/v/0.0.0/langs/fr.ini
@@ -386,10 +386,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Si vous ne pouvez pas recevoir les codes par Goo
 LEGEND_GENERAL = "Général"
 LABEL_LANGUAGE = "Langue"
 LABEL_EDITOR = "Éditeur de texte par défaut"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Brut"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Html"
+LABEL_EDITOR_PLAIN = "Brut"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Interface animation"
 LABEL_ANIMATION_FULL = "Full"
 LABEL_ANIMATION_NORMAL = "Normal"
diff --git a/rainloop/v/0.0.0/langs/hu.ini b/rainloop/v/0.0.0/langs/hu.ini
index d72179f8e..522d62442 100644
--- a/rainloop/v/0.0.0/langs/hu.ini
+++ b/rainloop/v/0.0.0/langs/hu.ini
@@ -386,10 +386,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica
 LEGEND_GENERAL = "General"
 LABEL_LANGUAGE = "Language"
 LABEL_EDITOR = "Default text editor"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Plain"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Html"
+LABEL_EDITOR_PLAIN = "Plain"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Interface animation"
 LABEL_ANIMATION_FULL = "Full"
 LABEL_ANIMATION_NORMAL = "Normal"
diff --git a/rainloop/v/0.0.0/langs/is.ini b/rainloop/v/0.0.0/langs/is.ini
index a154707fa..96f82c750 100644
--- a/rainloop/v/0.0.0/langs/is.ini
+++ b/rainloop/v/0.0.0/langs/is.ini
@@ -386,10 +386,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica
 LEGEND_GENERAL = "Almennt"
 LABEL_LANGUAGE = "Tungumál"
 LABEL_EDITOR = "Sjálfgefinn textaritill"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Venjulegur"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Html"
+LABEL_EDITOR_PLAIN = "Venjulegur"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Interface animation"
 LABEL_ANIMATION_FULL = "Full"
 LABEL_ANIMATION_NORMAL = "Normal"
diff --git a/rainloop/v/0.0.0/langs/it.ini b/rainloop/v/0.0.0/langs/it.ini
index b4fea2bfa..156521ebe 100644
--- a/rainloop/v/0.0.0/langs/it.ini
+++ b/rainloop/v/0.0.0/langs/it.ini
@@ -387,10 +387,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Se non puoi ricevere codici da Google Authentica
 LEGEND_GENERAL = "Generali"
 LABEL_LANGUAGE = "Lingua"
 LABEL_EDITOR = "Editor di testo di default"
-LABEL_EDITOR_HTML_AS_DEFAULT = "HTML"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Testo semplice"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "HTML"
+LABEL_EDITOR_PLAIN = "Testo semplice"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Animazioni dell'interfaccia"
 LABEL_ANIMATION_FULL = "Tutte"
 LABEL_ANIMATION_NORMAL = "Normali"
diff --git a/rainloop/v/0.0.0/langs/ja-jp.ini b/rainloop/v/0.0.0/langs/ja-jp.ini
index 4c40733f3..511b822e6 100644
--- a/rainloop/v/0.0.0/langs/ja-jp.ini
+++ b/rainloop/v/0.0.0/langs/ja-jp.ini
@@ -386,10 +386,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica
 LEGEND_GENERAL = "全般"
 LABEL_LANGUAGE = "言語"
 LABEL_EDITOR = "メール形式"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "プレーンテキスト"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Html"
+LABEL_EDITOR_PLAIN = "プレーンテキスト"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Interface animation"
 LABEL_ANIMATION_FULL = "Full"
 LABEL_ANIMATION_NORMAL = "Normal"
diff --git a/rainloop/v/0.0.0/langs/ko-kr.ini b/rainloop/v/0.0.0/langs/ko-kr.ini
index 7c233ba8b..0911b43ee 100644
--- a/rainloop/v/0.0.0/langs/ko-kr.ini
+++ b/rainloop/v/0.0.0/langs/ko-kr.ini
@@ -383,10 +383,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica
 LEGEND_GENERAL = "일반"
 LABEL_LANGUAGE = "언어"
 LABEL_EDITOR = "기본 본문 편집 도구"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Html 편집기"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "텍스트 편집기"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Html 편집기"
+LABEL_EDITOR_PLAIN = "텍스트 편집기"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "인터페이스 애니메이션"
 LABEL_ANIMATION_FULL = "최대 애니메이션"
 LABEL_ANIMATION_NORMAL = "보통 애니메이션"
diff --git a/rainloop/v/0.0.0/langs/lt.ini b/rainloop/v/0.0.0/langs/lt.ini
index 12d5a3748..17dddaad2 100644
--- a/rainloop/v/0.0.0/langs/lt.ini
+++ b/rainloop/v/0.0.0/langs/lt.ini
@@ -394,10 +394,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Jei negaunate kodo per Google autentifikavimo kl
 LEGEND_GENERAL = "Pagrindiniai"
 LABEL_LANGUAGE = "Kalba"
 LABEL_EDITOR = "Numatytas teksto redaktorius"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Paprastas"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Html"
+LABEL_EDITOR_PLAIN = "Paprastas"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Paprastas (forced)"
 LABEL_ANIMATION = "Sąsajos animacija"
 LABEL_ANIMATION_FULL = "Pilnai"
 LABEL_ANIMATION_NORMAL = "Normaliai"
diff --git a/rainloop/v/0.0.0/langs/lv.ini b/rainloop/v/0.0.0/langs/lv.ini
index bc38dcbb3..c67d5c31a 100644
--- a/rainloop/v/0.0.0/langs/lv.ini
+++ b/rainloop/v/0.0.0/langs/lv.ini
@@ -386,10 +386,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica
 LEGEND_GENERAL = "Vispārējie"
 LABEL_LANGUAGE = "Valoda"
 LABEL_EDITOR = "Galvenais teksta editors"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Teksts"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Html"
+LABEL_EDITOR_PLAIN = "Teksts"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Interface animation"
 LABEL_ANIMATION_FULL = "Full"
 LABEL_ANIMATION_NORMAL = "Normal"
diff --git a/rainloop/v/0.0.0/langs/nl.ini b/rainloop/v/0.0.0/langs/nl.ini
index a5e1c8d79..ae5047ccc 100644
--- a/rainloop/v/0.0.0/langs/nl.ini
+++ b/rainloop/v/0.0.0/langs/nl.ini
@@ -386,10 +386,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Als u geen codes ontvangt via de Google Authenti
 LEGEND_GENERAL = "Algemeen"
 LABEL_LANGUAGE = "Taal"
 LABEL_EDITOR = "Standaard tekst editor"
-LABEL_EDITOR_HTML_AS_DEFAULT = "HTML"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Platte tekst"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "HTML"
+LABEL_EDITOR_PLAIN = "Platte tekst"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Interface animatie"
 LABEL_ANIMATION_FULL = "Volledig"
 LABEL_ANIMATION_NORMAL = "Normaal"
diff --git a/rainloop/v/0.0.0/langs/no.ini b/rainloop/v/0.0.0/langs/no.ini
index ae7ac330a..63c28b5f6 100644
--- a/rainloop/v/0.0.0/langs/no.ini
+++ b/rainloop/v/0.0.0/langs/no.ini
@@ -385,10 +385,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Om du ikke mottar koder fra Google Authenticator
 LEGEND_GENERAL = "Generelt"
 LABEL_LANGUAGE = "Språk"
 LABEL_EDITOR = "Standard teksteditor"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Ren tekst"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Html"
+LABEL_EDITOR_PLAIN = "Ren tekst"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Interface animasjon"
 LABEL_ANIMATION_FULL = "Full"
 LABEL_ANIMATION_NORMAL = "Normal"
diff --git a/rainloop/v/0.0.0/langs/pl.ini b/rainloop/v/0.0.0/langs/pl.ini
index 5fc30cb31..a3b90d480 100644
--- a/rainloop/v/0.0.0/langs/pl.ini
+++ b/rainloop/v/0.0.0/langs/pl.ini
@@ -393,10 +393,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Jeżeli nie możesz otrzymać kodu poprzez apika
 LEGEND_GENERAL = "Ogólne"
 LABEL_LANGUAGE = "Język"
 LABEL_EDITOR = "Format wiadomości"
-LABEL_EDITOR_HTML_AS_DEFAULT = "HTML"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Zwykły tekst"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "HTML"
+LABEL_EDITOR_PLAIN = "Zwykły tekst"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Animacja interfejsu"
 LABEL_ANIMATION_FULL = "Pełna"
 LABEL_ANIMATION_NORMAL = "Zwykła"
diff --git a/rainloop/v/0.0.0/langs/pt-br.ini b/rainloop/v/0.0.0/langs/pt-br.ini
index e4812d4d7..83bfba33e 100644
--- a/rainloop/v/0.0.0/langs/pt-br.ini
+++ b/rainloop/v/0.0.0/langs/pt-br.ini
@@ -394,10 +394,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Se você não puder receber os códigos via Goog
 LEGEND_GENERAL = "Geral"
 LABEL_LANGUAGE = "Idioma"
 LABEL_EDITOR = "Editor de texto padrão"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Texto Simples"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Html"
+LABEL_EDITOR_PLAIN = "Texto Simples"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Animação de interface"
 LABEL_ANIMATION_FULL = "Completa"
 LABEL_ANIMATION_NORMAL = "Normal"
diff --git a/rainloop/v/0.0.0/langs/pt-pt.ini b/rainloop/v/0.0.0/langs/pt-pt.ini
index 73626f044..a328100f1 100644
--- a/rainloop/v/0.0.0/langs/pt-pt.ini
+++ b/rainloop/v/0.0.0/langs/pt-pt.ini
@@ -386,10 +386,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica
 LEGEND_GENERAL = "Geral"
 LABEL_LANGUAGE = "Linguagem"
 LABEL_EDITOR = "Editor de texto padrão"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Simples"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Html"
+LABEL_EDITOR_PLAIN = "Simples"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Animação de interface"
 LABEL_ANIMATION_FULL = "Completa"
 LABEL_ANIMATION_NORMAL = "Normal"
diff --git a/rainloop/v/0.0.0/langs/ro.ini b/rainloop/v/0.0.0/langs/ro.ini
index 654695f0e..e94cc2d4e 100644
--- a/rainloop/v/0.0.0/langs/ro.ini
+++ b/rainloop/v/0.0.0/langs/ro.ini
@@ -385,10 +385,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica
 LEGEND_GENERAL = "Setări de bază"
 LABEL_LANGUAGE = "Limbă"
 LABEL_EDITOR = "Editor de text implicit"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Formatat"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Simplu"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Formatat"
+LABEL_EDITOR_PLAIN = "Simplu"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Interfață animație"
 LABEL_ANIMATION_FULL = "Complet"
 LABEL_ANIMATION_NORMAL = "Normal"
diff --git a/rainloop/v/0.0.0/langs/ru.ini b/rainloop/v/0.0.0/langs/ru.ini
index 56c4d63e3..5f25702b9 100644
--- a/rainloop/v/0.0.0/langs/ru.ini
+++ b/rainloop/v/0.0.0/langs/ru.ini
@@ -386,10 +386,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Если вы не можете получить
 LEGEND_GENERAL = "Основные Настройки"
 LABEL_LANGUAGE = "Язык"
 LABEL_EDITOR = "Редактор текста по умолчанию"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Форматированный"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Простой"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Форматированный (форсированный)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Простой (форсированный)"
+LABEL_EDITOR_HTML = "Форматированный"
+LABEL_EDITOR_PLAIN = "Простой"
+LABEL_EDITOR_HTML_FORCED = "Форматированный (форсированный)"
+LABEL_EDITOR_PLAIN_FORCED = "Простой (форсированный)"
 LABEL_ANIMATION = "Анимация интерфейса"
 LABEL_ANIMATION_FULL = "Полная"
 LABEL_ANIMATION_NORMAL = "Нормальная"
diff --git a/rainloop/v/0.0.0/langs/sk.ini b/rainloop/v/0.0.0/langs/sk.ini
index a5d7ffcc1..71025f08b 100644
--- a/rainloop/v/0.0.0/langs/sk.ini
+++ b/rainloop/v/0.0.0/langs/sk.ini
@@ -386,10 +386,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica
 LEGEND_GENERAL = "Všeobecné"
 LABEL_LANGUAGE = "Jazyk"
 LABEL_EDITOR = "Predvolený editor správ"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Text"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Html"
+LABEL_EDITOR_PLAIN = "Text"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Animácie prostredia"
 LABEL_ANIMATION_FULL = "Full"
 LABEL_ANIMATION_NORMAL = "Normal"
diff --git a/rainloop/v/0.0.0/langs/sv.ini b/rainloop/v/0.0.0/langs/sv.ini
index 6db82545b..f6234afae 100644
--- a/rainloop/v/0.0.0/langs/sv.ini
+++ b/rainloop/v/0.0.0/langs/sv.ini
@@ -394,10 +394,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Om du inte kan ta emot koderna med Google Authen
 LEGEND_GENERAL = "Allmänt"
 LABEL_LANGUAGE = "Språk"
 LABEL_EDITOR = "Textredigerare"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Enkel"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Html"
+LABEL_EDITOR_PLAIN = "Enkel"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Animerat utseende"
 LABEL_ANIMATION_FULL = "Full"
 LABEL_ANIMATION_NORMAL = "Normal"
diff --git a/rainloop/v/0.0.0/langs/tr.ini b/rainloop/v/0.0.0/langs/tr.ini
index 028ad7064..4f76b0243 100644
--- a/rainloop/v/0.0.0/langs/tr.ini
+++ b/rainloop/v/0.0.0/langs/tr.ini
@@ -392,10 +392,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Google Şifrematik'te aracılığıyla kodları
 LEGEND_GENERAL = "Genel"
 LABEL_LANGUAGE = "Dil"
 LABEL_EDITOR = "Varsayılan text editör"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Düz"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Html"
+LABEL_EDITOR_PLAIN = "Düz"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Arayüz animasyonu"
 LABEL_ANIMATION_FULL = "Tam Ekran"
 LABEL_ANIMATION_NORMAL = "Normal"
diff --git a/rainloop/v/0.0.0/langs/ua.ini b/rainloop/v/0.0.0/langs/ua.ini
index b88b8a9ed..7dfa6eb3d 100644
--- a/rainloop/v/0.0.0/langs/ua.ini
+++ b/rainloop/v/0.0.0/langs/ua.ini
@@ -386,10 +386,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "Якщо Ви не можете отримати
 LEGEND_GENERAL = "Основні Налаштування"
 LABEL_LANGUAGE = "Мова"
 LABEL_EDITOR = "Редактор тексту за змовчуванням"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Форматований"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Простий"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Форматований"
+LABEL_EDITOR_PLAIN = "Простий"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "Анімація інтерфейсу"
 LABEL_ANIMATION_FULL = "Повна"
 LABEL_ANIMATION_NORMAL = "Нормальна"
diff --git a/rainloop/v/0.0.0/langs/zh-cn.ini b/rainloop/v/0.0.0/langs/zh-cn.ini
index c0e866939..c1b187b02 100644
--- a/rainloop/v/0.0.0/langs/zh-cn.ini
+++ b/rainloop/v/0.0.0/langs/zh-cn.ini
@@ -386,10 +386,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica
 LEGEND_GENERAL = "一般设置"
 LABEL_LANGUAGE = "语言"
 LABEL_EDITOR = "默认格式"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Plain"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Html"
+LABEL_EDITOR_PLAIN = "Plain"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "界面动画"
 LABEL_ANIMATION_FULL = "完整"
 LABEL_ANIMATION_NORMAL = "正常"
diff --git a/rainloop/v/0.0.0/langs/zh-tw.ini b/rainloop/v/0.0.0/langs/zh-tw.ini
index 71a7d7e5b..9eb52a8d2 100644
--- a/rainloop/v/0.0.0/langs/zh-tw.ini
+++ b/rainloop/v/0.0.0/langs/zh-tw.ini
@@ -394,10 +394,10 @@ TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authentica
 LEGEND_GENERAL = "一般設置"
 LABEL_LANGUAGE = "語言"
 LABEL_EDITOR = "默認格式"
-LABEL_EDITOR_HTML_AS_DEFAULT = "Html"
-LABEL_EDITOR_PLAIN_AS_DEFAULT = "Plain"
-LABEL_EDITOR_HTML_FORCE_AS_DEFAULT = "Html (forced)"
-LABEL_EDITOR_PLAIN_FORCE_AS_DEFAULT = "Plain (forced)"
+LABEL_EDITOR_HTML = "Html"
+LABEL_EDITOR_PLAIN = "Plain"
+LABEL_EDITOR_HTML_FORCED = "Html (forced)"
+LABEL_EDITOR_PLAIN_FORCED = "Plain (forced)"
 LABEL_ANIMATION = "介面動畫"
 LABEL_ANIMATION_FULL = "完整"
 LABEL_ANIMATION_NORMAL = "正常"