From e7c15a697d531de391d74cced2525d1314617569 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 8 Nov 2017 16:40:33 -0500
Subject: [PATCH] (js) Fix mail composition from message headers

Fixes #4335
---
 UI/WebServerResources/js/Mailer/Account.service.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/UI/WebServerResources/js/Mailer/Account.service.js b/UI/WebServerResources/js/Mailer/Account.service.js
index 41b856737..e2105ef04 100644
--- a/UI/WebServerResources/js/Mailer/Account.service.js
+++ b/UI/WebServerResources/js/Mailer/Account.service.js
@@ -323,8 +323,12 @@
         Account.$log.debug('New message (edit): ' + JSON.stringify(data, undefined, 2));
         angular.extend(message.editable, data);
         message.isNew = true;
-        if (options && options.mailto)
-          message.$parseMailto(options.mailto);
+        if (options && options.mailto) {
+          if (angular.isObject(options.mailto))
+            angular.extend(message.editable, options.mailto);
+          else
+            message.$parseMailto(options.mailto);
+        }
         return message;
       });
     });