diff --git a/dev/External/SquireUI.js b/dev/External/SquireUI.js
index 036cc3b7f..4647af3c3 100644
--- a/dev/External/SquireUI.js
+++ b/dev/External/SquireUI.js
@@ -451,7 +451,6 @@ class SquireUI
 				} else {
 					const squire = this.squire,
 						root = squire.getRoot(),
-						range = squire.getSelection(),
 						br = createElement('br'),
 						div = createElement('div');
 					div.className = 'rl-signature';
@@ -461,9 +460,7 @@ class SquireUI
 					// Move cursor above signature
 					div.before(br);
 					div.before(br.cloneNode());
-					range.setStart(br, 0);
-					range.setEnd(br, 0);
-					squire.setSelection( range );
+					this.setCursorAt(br);
 				}
 				this._prev_txt_sig = signature;
 			} catch (e) {
@@ -478,7 +475,18 @@ class SquireUI
 
 	setData(html) {
 //		this.plain.value = html;
-		this.squire.setHTML(trimLines(html));
+		const squire = this.squire,
+			root = squire.getRoot();
+		squire.setHTML(trimLines(html));
+		this.setCursorAt(root);
+	}
+
+	setCursorAt(node) {
+		const squire = this.squire,
+			range = squire.getSelection();
+		range.setStart(node, 0);
+		range.setEnd(node, 0);
+		squire.setSelection( range );
 	}
 
 	focus() {
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 2654a2730..3168e6756 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -1037,17 +1037,17 @@ export class ComposePopupView extends AbstractViewPopup {
 				case ComposeType.Reply:
 				case ComposeType.ReplyAll:
 					sFrom = message.fromToLine(false, true);
-					sText = '<div><p>' + i18n('COMPOSE/REPLY_MESSAGE_TITLE', { DATETIME: sDate, EMAIL: sFrom })
+					sText = '<br><br><p>' + i18n('COMPOSE/REPLY_MESSAGE_TITLE', { DATETIME: sDate, EMAIL: sFrom })
 						+ ':</p><blockquote>'
 						+ sText.replace(/<img[^>]+>/g, '').replace(/<a\s[^>]+><\/a>/g, '').trim()
-						+ '</blockquote></div>';
+						+ '</blockquote>';
 					break;
 
 				case ComposeType.Forward:
 					sFrom = message.fromToLine(false, true);
 					sTo = message.toToLine(false, true);
 					sCc = message.ccToLine(false, true);
-					sText = '<div><p>' + i18n('COMPOSE/FORWARD_MESSAGE_TOP_TITLE') + '</p>'
+					sText = '<br><br><p>' + i18n('COMPOSE/FORWARD_MESSAGE_TOP_TITLE') + '</p><div>'
 						+ i18n('GLOBAL/FROM') + ': ' + sFrom
 						+ '<br>'
 						+ i18n('GLOBAL/TO') + ': ' + sTo