From 593d3af6d495e0f872e4e8d60cce362df8a2b342 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 17 May 2022 11:08:05 +0200
Subject: [PATCH] Resolve #396

---
 dev/External/SquireUI.js  | 10 ++--------
 dev/View/Popup/Compose.js |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/dev/External/SquireUI.js b/dev/External/SquireUI.js
index 4647af3c3..a647e86a6 100644
--- a/dev/External/SquireUI.js
+++ b/dev/External/SquireUI.js
@@ -460,7 +460,6 @@ class SquireUI
 					// Move cursor above signature
 					div.before(br);
 					div.before(br.cloneNode());
-					this.setCursorAt(br);
 				}
 				this._prev_txt_sig = signature;
 			} catch (e) {
@@ -475,14 +474,9 @@ class SquireUI
 
 	setData(html) {
 //		this.plain.value = html;
-		const squire = this.squire,
-			root = squire.getRoot();
+		const squire = this.squire;
 		squire.setHTML(trimLines(html));
-		this.setCursorAt(root);
-	}
-
-	setCursorAt(node) {
-		const squire = this.squire,
+		const node = squire.getRoot(),
 			range = squire.getSelection();
 		range.setStart(node, 0);
 		range.setEnd(node, 0);
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index e7e937af5..8d67433e0 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -842,7 +842,7 @@ export class ComposePopupView extends AbstractViewPopup {
 					.replace(/{{DATE}}/g, new Date().format('LLLL'))
 					.replace(/{{TIME}}/g, new Date().format('LT'))
 					.replace(/{{MOMENT:[^}]+}}/g, '');
-				editor.setSignature(signature, isHtml, !!identity.signatureInsertBefore());
+				signature.length && editor.setSignature(signature, isHtml, !!identity.signatureInsertBefore());
 			});
 		}
 	}