From b141031ccd67a9cb4bb591e056d0951fc3930720 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Sat, 18 Apr 2015 08:50:06 -0400
Subject: [PATCH] Initialize arrays of new message instance

---
 UI/WebServerResources/js/Mailer/account-model.js | 2 +-
 UI/WebServerResources/js/Mailer/message-model.js | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/UI/WebServerResources/js/Mailer/account-model.js b/UI/WebServerResources/js/Mailer/account-model.js
index 23d9a0e88..769b428a0 100644
--- a/UI/WebServerResources/js/Mailer/account-model.js
+++ b/UI/WebServerResources/js/Mailer/account-model.js
@@ -200,7 +200,7 @@
       // Fetch draft initial data
       Account.$$resource.fetch(message.$absolutePath({asDraft: true}), 'edit').then(function(data) {
         Account.$log.debug('New message: ' + JSON.stringify(data, undefined, 2));
-        message.editable = data;
+        angular.extend(message.editable, data);
         deferred.resolve(message);
       }, function(data) {
         deferred.reject(data);
diff --git a/UI/WebServerResources/js/Mailer/message-model.js b/UI/WebServerResources/js/Mailer/message-model.js
index e6b1bf231..d41ae46ed 100644
--- a/UI/WebServerResources/js/Mailer/message-model.js
+++ b/UI/WebServerResources/js/Mailer/message-model.js
@@ -15,6 +15,7 @@
     this.$mailbox = mailbox;
     this.$hasUnsafeContent = false;
     this.$loadUnsafeContent = false;
+    this.editable = {to: [], cc: [], bcc: []};
     // Data is immediately available
     if (typeof futureMessageData.then !== 'function') {
       //console.debug(JSON.stringify(futureMessageData, undefined, 2));
@@ -184,7 +185,7 @@
       angular.extend(_this, data);
       Message.$$resource.fetch(_this.$absolutePath({asDraft: true}), 'edit').then(function(data) {
         Message.$log.debug('editable = ' + JSON.stringify(data, undefined, 2));
-        _this.editable = data;
+        angular.extend(_this.editable, data);
         deferred.resolve(data.text);
       }, deferred.reject);
     }, deferred.reject);
@@ -263,7 +264,7 @@
       // Fetch draft initial data
       Message.$$resource.fetch(message.$absolutePath({asDraft: true}), 'edit').then(function(data) {
         Message.$log.debug('New ' + action + ': ' + JSON.stringify(data, undefined, 2));
-        message.editable = data;
+        angular.extend(message.editable, data);
         deferred.resolve(message);
       }, function(data) {
         deferred.reject(data);