From 6c420861d40bc59dcaa62ac202776e13a852e38f Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 14 Feb 2022 12:56:08 -0500
Subject: [PATCH] fix(mail(js)): handle new message from template in popup
 window

---
 UI/WebServerResources/js/Mailer/Mailer.popup.js           | 2 +-
 .../js/Mailer/MessageEditorController.js                  | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/UI/WebServerResources/js/Mailer/Mailer.popup.js b/UI/WebServerResources/js/Mailer/Mailer.popup.js
index 9e4913fd5..b3e67bd71 100644
--- a/UI/WebServerResources/js/Mailer/Mailer.popup.js
+++ b/UI/WebServerResources/js/Mailer/Mailer.popup.js
@@ -81,7 +81,7 @@
         }
       })
       .state('mail.account.mailbox.message.action', {
-        url: '/{actionName:(?:reply|replyall|forward)}',
+        url: '/{actionName:(?:compose|reply|replyall|forward)}',
         views: {
           'message@': {
             template: '<ui-view/>',
diff --git a/UI/WebServerResources/js/Mailer/MessageEditorController.js b/UI/WebServerResources/js/Mailer/MessageEditorController.js
index a71b9fafb..42e51471b 100644
--- a/UI/WebServerResources/js/Mailer/MessageEditorController.js
+++ b/UI/WebServerResources/js/Mailer/MessageEditorController.js
@@ -83,6 +83,14 @@
           _addAttachments();
         });
       }
+      else if ($stateParams.actionName == 'compose') {
+        stateMessage.$compose().then(function(msgObject) {
+          vm.message = msgObject;
+          vm.fromIdentity = msgObject.editable.from;
+          _updateFileUploader();
+          _addAttachments();
+        });
+      }
       else if (angular.isDefined(stateMessage)) {
         this.message = stateMessage;
         _updateFileUploader();