diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index 8e9b36018..19c1a1864 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -66,7 +66,14 @@ class HtmlEditor {
 	 * @returns {boolean}
 	 */
 	isHtml() {
-		return this.editor ? 'plain' !== this.editor.mode : false;
+		return this.editor ? !this.isPlain() : false;
+	}
+
+	/**
+	 * @returns {boolean}
+	 */
+	isPlain() {
+		return this.editor ? 'plain' === this.editor.mode : false;
 	}
 
 	/**
@@ -100,7 +107,7 @@ class HtmlEditor {
 		let result = '';
 		if (this.editor) {
 			try {
-				if ('plain' === this.editor.mode && this.editor.plugins.plain && this.editor.__plain) {
+				if (this.isPlain() && this.editor.plugins.plain && this.editor.__plain) {
 					result = this.editor.__plain.getRawData();
 				} else {
 					result = wrapIsHtml
@@ -123,59 +130,45 @@ class HtmlEditor {
 		return (this.isHtml() ? ':HTML:' : '') + this.getData(wrapIsHtml);
 	}
 
-	modeToggle(plain) {
-		if (this.editor) {
-			try {
-				if (plain) {
-					if ('plain' === this.editor.mode) {
-						this.editor.setMode('wysiwyg');
-					}
-				} else if ('wysiwyg' === this.editor.mode) {
-					this.editor.setMode('plain');
-				}
-			} catch (e) {} // eslint-disable-line no-empty
-		}
+	modeWysiwyg() {
+		try {
+			this.editor && this.editor.setMode('wysiwyg');
+		} catch (e) { console.error(e); }
+	}
+	modePlain() {
+		try {
+			this.editor && this.editor.setMode('plain');
+		} catch (e) { console.error(e); }
 	}
 
-	setHtmlOrPlain(text, focus) {
+	setHtmlOrPlain(text) {
 		if (':HTML:' === text.substr(0, 6)) {
-			this.setHtml(text.substr(6), focus);
+			this.setHtml(text.substr(6));
 		} else {
-			this.setPlain(text, focus);
+			this.setPlain(text);
 		}
 	}
 
-	setHtml(html, focus) {
+	setData(mode, data) {
 		if (this.editor && this.__inited) {
 			this.clearCachedSignature();
-
-			this.modeToggle(true);
-
-			html = html.replace(/<p[^>]*><\/p>/gi, '');
-
 			try {
-				this.editor.setData(html);
-			} catch (e) {} // eslint-disable-line no-empty
-
-			focus && this.focus();
+				this.editor.setMode(mode);
+				if (this.isPlain() && this.editor.plugins.plain && this.editor.__plain) {
+					this.editor.__plain.setRawData(data);
+				} else {
+					this.editor.setData(data);
+				}
+			} catch (e) { console.error(e); }
 		}
 	}
 
-	setPlain(plain, focus) {
-		if (this.editor && this.__inited) {
-			this.clearCachedSignature();
+	setHtml(html) {
+		this.setData('wysiwyg', html/*.replace(/<p[^>]*><\/p>/gi, '')*/);
+	}
 
-			this.modeToggle(false);
-			if ('plain' === this.editor.mode && this.editor.plugins.plain && this.editor.__plain) {
-				this.editor.__plain.setRawData(plain);
-			} else {
-				try {
-					this.editor.setData(plain);
-				} catch (e) {} // eslint-disable-line no-empty
-			}
-
-			focus && this.focus();
-		}
+	setPlain(txt) {
+		this.setData('plain', txt);
 	}
 
 	init() {
@@ -208,7 +201,7 @@ class HtmlEditor {
 				this.editor.on('focus', () => this.blurTimer && clearTimeout(this.blurTimer));
 				this.editor.on('mode', () => {
 					this.blurTrigger();
-					this.onModeChange && this.onModeChange('plain' !== this.editor.mode);
+					this.onModeChange && this.onModeChange(!this.isPlain());
 				});
 			}
 		}
@@ -234,8 +227,8 @@ class HtmlEditor {
 		} catch (e) {} // eslint-disable-line no-empty
 	}
 
-	clear(focus) {
-		this.setHtml('', focus);
+	clear() {
+		this.setHtml('');
 	}
 }
 
diff --git a/dev/Common/UtilsUser.js b/dev/Common/UtilsUser.js
index 8a0d29b74..925bed9d0 100644
--- a/dev/Common/UtilsUser.js
+++ b/dev/Common/UtilsUser.js
@@ -85,7 +85,7 @@ export function htmlToPlain(html) {
 			args && 1 < args.length
 				? args[1]
 						.toString()
-						.replace(/[\n]/gm, '<br />')
+						.replace(/[\n]/gm, '<br/>')
 						.replace(/[\r]/gm, '')
 				: '',
 		fixAttibuteValue = (...args) => (args && 1 < args.length ? '' + args[1] + encodeHtml(args[2]) : ''),
@@ -204,7 +204,7 @@ export function plainToHtml(plain) {
 		.replace(/</g, '&lt;')
 		.replace(/~~~blockquote~~~[\s]*/g, '<blockquote>')
 		.replace(/[\s]*~~~\/blockquote~~~/g, '</blockquote>')
-		.replace(/\n/g, '<br />');
+		.replace(/\n/g, '<br/>');
 }
 
 rl.Utils = {
diff --git a/dev/External/CKEditor.js b/dev/External/CKEditor.js
index 580309831..a0c4b791b 100644
--- a/dev/External/CKEditor.js
+++ b/dev/External/CKEditor.js
@@ -85,7 +85,7 @@ export function createCKEditor(element)
 					reader.onloadend = () => {
 						if (reader.result && 'wysiwyg' === editor.mode) {
 							try {
-								editor.setData(editor.getData().replace(imageId, `<img src="${reader.result}" />`));
+								editor.setData(editor.getData().replace(imageId, `<img src="${reader.result}"/>`));
 							} catch (e) {} // eslint-disable-line no-empty
 						}
 					};
diff --git a/dev/External/SquireUI.js b/dev/External/SquireUI.js
index f024121e1..4466cac14 100644
--- a/dev/External/SquireUI.js
+++ b/dev/External/SquireUI.js
@@ -491,20 +491,20 @@ class SquireUI
 	}
 
 	setMode(mode) {
-		let cl = this.container.classList;
-		cl.remove('squire-mode-'+this.mode);
-		if ('plain' == mode) {
-			let html = this.squire.getHTML();
-			this.plain.value = rl.Utils.htmlToPlain(html, true).trim();
-		} else {
-			let plain = this.plain.value;
-			this.setData(rl.Utils.plainToHtml(plain, true));
-			mode = 'wysiwyg';
+		if (this.mode != mode) {
+			let cl = this.container.classList;
+			cl.remove('squire-mode-'+this.mode);
+			if ('plain' == mode) {
+				this.plain.value = rl.Utils.htmlToPlain(this.squire.getHTML(), true).trim();
+			} else {
+				this.setData(rl.Utils.plainToHtml(this.plain.value, true));
+				mode = 'wysiwyg';
+			}
+			this.mode = mode; // 'wysiwyg' or 'plain'
+			cl.add('squire-mode-'+mode);
+			this.onModeChange && this.onModeChange();
+			setTimeout(()=>this.focus(),1);
 		}
-		this.mode = mode; // 'wysiwyg' or 'plain'
-		cl.add('squire-mode-'+mode);
-		this.onModeChange && this.onModeChange();
-		setTimeout(()=>this.focus(),1);
 	}
 
 	// CKeditor gimmicks used by HtmlEditor
@@ -551,6 +551,7 @@ class SquireUI
 	}
 
 	setData(html) {
+//		this.plain.value = html;
 		this.squire.setHTML(trimLines(html));
 	}
 
diff --git a/dev/Html/PreviewMessage.html b/dev/Html/PreviewMessage.html
index dc982e2d9..7632cf6fe 100644
--- a/dev/Html/PreviewMessage.html
+++ b/dev/Html/PreviewMessage.html
@@ -1,7 +1,7 @@
 <html>
 <head>
-	<meta charset="utf-8" />
-	<meta name="viewport" content="user-scalable=no" />
+	<meta charset="utf-8"/>
+	<meta name="viewport" content="user-scalable=no"/>
 	<title>{{subject}}</title>
 	<style>
 html, body {
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index e3f191a89..b813ecc6f 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -528,11 +528,7 @@ class ComposePopupView extends AbstractViewPopup {
 	openOpenPgpPopup() {
 		if (PgpStore.capaOpenPGP() && this.oEditor && !this.oEditor.isHtml()) {
 			showScreenPopup(ComposeOpenPgpPopupView, [
-				(result) => {
-					this.editor((editor) => {
-						editor.setPlain(result);
-					});
-				},
+				result => this.editor(editor => editor.setPlain(result)),
 				this.oEditor.getData(false),
 				this.currentIdentity(),
 				this.to(),
@@ -568,9 +564,7 @@ class ComposePopupView extends AbstractViewPopup {
 				}
 			};
 
-		identities.forEach((item, index) => {
-			identitiesCache[item.email()] = [item, index];
-		});
+		identities.forEach((item, index) => identitiesCache[item.email()] = [item, index]);
 
 		if (message) {
 			switch (composeType) {
@@ -700,9 +694,7 @@ class ComposePopupView extends AbstractViewPopup {
 		}
 	}
 
-	converSignature(signature) {
-		signature = signature.replace(/[\r]/g, '');
-
+	convertSignature(signature) {
 		let fromLine = this.oLastMessage ? this.emailArrayToStringLineHelper(this.oLastMessage.from, true) : '';
 		if (fromLine) {
 			signature = signature.replace(/{{FROM-FULL}}/g, fromLine);
@@ -714,39 +706,24 @@ class ComposePopupView extends AbstractViewPopup {
 			signature = signature.replace(/{{FROM}}/g, fromLine);
 		}
 
-		signature = signature.replace(/[\s]{1,2}{{FROM}}/g, '{{FROM}}');
-		signature = signature.replace(/[\s]{1,2}{{FROM-FULL}}/g, '{{FROM-FULL}}');
-
-		signature = signature.replace(/{{FROM}}/g, '');
-		signature = signature.replace(/{{FROM-FULL}}/g, '');
-
-		if (signature.includes('{{DATE}}')) {
-			signature = signature.replace(/{{DATE}}/g, new Date().format('LLLL'));
-		}
-
-		if (signature.includes('{{TIME}}')) {
-			signature = signature.replace(/{{TIME}}/g, new Date().format('LT'));
-		}
-
-		signature = signature.replace(/{{MOMENT:[^}]+}}/g, '');
-
-		return signature;
+		return signature
+			.replace(/[\r]/g, '')
+			.replace(/[\s]{1,2}?{{FROM}}/g, '')
+			.replace(/[\s]{1,2}?{{FROM-FULL}}/g, '')
+			.replace(/{{DATE}}/g, new Date().format('LLLL'))
+			.replace(/{{TIME}}/g, new Date().format('LT'))
+			.replace(/{{MOMENT:[^}]+}}/g, '');
 	}
 
 	setSignatureFromIdentity(identity) {
 		if (identity) {
-			this.editor((editor) => {
-				let isHtml = false,
-					signature = identity.signature();
+			this.editor(editor => {
+				let signature = identity.signature(),
+					isHtml = signature && ':HTML:' === signature.substr(0, 6);
 
-				if (signature) {
-					if (':HTML:' === signature.substr(0, 6)) {
-						isHtml = true;
-						signature = signature.substr(6);
-					}
-				}
-
-				editor.setSignature(this.converSignature(signature), isHtml, !!identity.signatureInsertBefore());
+				editor.setSignature(
+					this.convertSignature(isHtml ? signature.substr(6) : signature),
+					isHtml, !!identity.signatureInsertBefore());
 			});
 		}
 	}
@@ -798,7 +775,7 @@ class ComposePopupView extends AbstractViewPopup {
 
 	onWarmUp() {
 		if (this.modalVisibility && !this.modalVisibility()) {
-			this.editor(editor => editor.modeToggle(false));
+			this.editor(editor => editor.modeWysiwyg());
 		}
 	}
 
@@ -827,6 +804,11 @@ class ComposePopupView extends AbstractViewPopup {
 		return aList.map(item => item.toLine(bFriendly)).join(', ');
 	}
 
+	isPlainEditor() {
+		let type = this.editorDefaultType();
+		return EditorDefaultType.Html !== type && EditorDefaultType.HtmlForced !== type;
+	}
+
 	/**
 	 * @param {string=} sType = ComposeType.Empty
 	 * @param {?MessageModel|Array=} oMessageOrArray = null
@@ -980,8 +962,8 @@ class ComposePopupView extends AbstractViewPopup {
 						'EMAIL': sFrom
 					});
 
-					sText = sText.replace(/<img[^>]+>/g, '').replace(/<a\s[^>]+><\/a>/g, '');
-					sText = '<br /><br />' + sReplyTitle + ':' + '<br /><br />' + '<blockquote>' + sText.trim() + '</blockquote>';
+					sText = sText.replace(/<img[^>]+>/g, '').replace(/<a\s[^>]+><\/a>/g, '').trim();
+					sText = '<br/><br/>' + sReplyTitle + ':<br/><br/><blockquote>' + sText + '</blockquote>';
 
 					break;
 
@@ -990,28 +972,28 @@ class ComposePopupView extends AbstractViewPopup {
 					sTo = message.toToLine(false, true);
 					sCc = message.ccToLine(false, true);
 					sText =
-						'<br /><br />' +
+						'<br/><br/>' +
 						i18n('COMPOSE/FORWARD_MESSAGE_TOP_TITLE') +
-						'<br />' +
+						'<br/>' +
 						i18n('GLOBAL/FROM') +
 						': ' +
 						sFrom +
-						'<br />' +
+						'<br/>' +
 						i18n('GLOBAL/TO') +
 						': ' +
 						sTo +
-						(sCc.length ? '<br />' + i18n('GLOBAL/CC') + ': ' + sCc : '') +
-						'<br />' +
+						(sCc.length ? '<br/>' + i18n('GLOBAL/CC') + ': ' + sCc : '') +
+						'<br/>' +
 						i18n('COMPOSE/FORWARD_MESSAGE_TOP_SENT') +
 						': ' +
 						encodeHtml(sDate) +
-						'<br />' +
+						'<br/>' +
 						i18n('GLOBAL/SUBJECT') +
 						': ' +
 						encodeHtml(sSubject) +
-						'<br /><br />' +
+						'<br/><br/>' +
 						sText.trim() +
-						'<br /><br />';
+						'<br/><br/>';
 					break;
 
 				case ComposeType.ForwardAsAttachment:
@@ -1020,14 +1002,14 @@ class ComposePopupView extends AbstractViewPopup {
 				// no default
 			}
 
-			this.editor((editor) => {
-				editor.setHtml(sText, false);
+			this.editor(editor => {
+				editor.setHtml(sText);
 
 				if (
 					EditorDefaultType.PlainForced === this.editorDefaultType() ||
 					(!message.isHtml() && EditorDefaultType.HtmlForced !== this.editorDefaultType())
 				) {
-					editor.modeToggle(false);
+					editor.modePlain();
 				}
 
 				if (identity && ComposeType.Draft !== lineComposeType && ComposeType.EditAsNew !== lineComposeType) {
@@ -1041,14 +1023,11 @@ class ComposePopupView extends AbstractViewPopup {
 
 			sText = null != sCustomPlainText ? '' + sCustomPlainText : '';
 
-			this.editor((editor) => {
-				editor.setHtml(sText, false);
+			this.editor(editor => {
+				editor.setHtml(sText);
 
-				if (
-					EditorDefaultType.Html !== this.editorDefaultType() &&
-					EditorDefaultType.HtmlForced !== this.editorDefaultType()
-				) {
-					editor.modeToggle(false);
+				if (this.isPlainEditor()) {
+					editor.modePlain();
 				}
 
 				if (identity) {
@@ -1058,18 +1037,13 @@ class ComposePopupView extends AbstractViewPopup {
 				this.setFocusInPopup();
 			});
 		} else if (isNonEmptyArray(oMessageOrArray)) {
-			oMessageOrArray.forEach(item => {
-				this.addMessageAsAttachment(item);
-			});
+			oMessageOrArray.forEach(item => this.addMessageAsAttachment(item));
 
-			this.editor((editor) => {
-				editor.setHtml('', false);
-
-				if (
-					EditorDefaultType.Html !== this.editorDefaultType() &&
-					EditorDefaultType.HtmlForced !== this.editorDefaultType()
-				) {
-					editor.modeToggle(false);
+			this.editor(editor => {
+				if (this.isPlainEditor()) {
+					editor.setPlain('')
+				} else {
+					editor.setHtml('');
 				}
 
 				if (identity && ComposeType.Draft !== lineComposeType && ComposeType.EditAsNew !== lineComposeType) {
@@ -1508,7 +1482,7 @@ class ComposePopupView extends AbstractViewPopup {
 		this.saving(false);
 
 		if (this.oEditor) {
-			this.oEditor.clear(false);
+			this.oEditor.clear();
 		}
 	}
 
diff --git a/dev/View/Popup/Template.js b/dev/View/Popup/Template.js
index d8693b2f8..fc7881213 100644
--- a/dev/View/Popup/Template.js
+++ b/dev/View/Popup/Template.js
@@ -85,7 +85,7 @@ class TemplatePopupView extends AbstractViewPopup {
 		this.submitError('');
 
 		if (this.editor) {
-			this.editor.setPlain('', false);
+			this.editor.setPlain('');
 		}
 	}