From 089935297c8c3911e684824b1925353e92a61cf6 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 3 Jul 2020 17:41:47 -0400
Subject: [PATCH] fix(mail(js)): respect signature placement when switching
 identity

---
 UI/WebServerResources/js/Mailer/MessageEditorController.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/UI/WebServerResources/js/Mailer/MessageEditorController.js b/UI/WebServerResources/js/Mailer/MessageEditorController.js
index 6b35e65d6..1f06db6a3 100644
--- a/UI/WebServerResources/js/Mailer/MessageEditorController.js
+++ b/UI/WebServerResources/js/Mailer/MessageEditorController.js
@@ -49,6 +49,7 @@
 
       this.composeType = Preferences.defaults.SOGoMailComposeMessageType;
 
+      this.signaturePlacement = Preferences.defaults.SOGoMailSignaturePlacement;
       this.replyPlacement = Preferences.defaults.SOGoMailReplyPlacement;
       if (this.message.origin && this.message.origin.action == 'forward') {
         // For forwards, place caret at top unconditionally
@@ -387,7 +388,7 @@
 
       if (!previousIdentity && signature.length > 0) {
         // Must place signature at proper place
-        if (!this.isNew() && this.replyPlacement == 'above') {
+        if (!this.isNew() && this.signaturePlacement == 'above') {
           var quotedMessageIndex = this.message.editable.text.search(new RegExp(nl + '.+?:( ?' + nl + '){2}(> |<blockquote type="cite")'));
           if (quotedMessageIndex >= 0) {
             this.message.editable.text =