From 827bc009828596225aec14a52af13cfb6a336af1 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 1 Dec 2015 11:19:18 -0500
Subject: [PATCH] (js) Fix list refresh when saving draft at index 0

---
 UI/WebServerResources/js/Mailer/Message.service.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js
index 3b89b485b..25be088ed 100644
--- a/UI/WebServerResources/js/Mailer/Message.service.js
+++ b/UI/WebServerResources/js/Mailer/Message.service.js
@@ -130,13 +130,16 @@
    * @param {number} uid - the new message UID
    */
   Message.prototype.$setUID = function(uid) {
-    var oldUID = this.uid || -1;
+    var oldUID = (this.uid || -1);
 
-    if (oldUID != uid) {
+    if (oldUID != parseInt(uid)) {
       this.uid = uid;
-      if (oldUID > -1 && this.$mailbox.uidsMap[oldUID]) {
-        this.$mailbox.uidsMap[uid] = this.$mailbox.uidsMap[oldUID];
-        this.$mailbox.uidsMap[oldUID] = null;
+      if (oldUID > -1) {
+        oldUID = oldUID.toString();
+        if (angular.isDefined(this.$mailbox.uidsMap[oldUID])) {
+          this.$mailbox.uidsMap[uid] = this.$mailbox.uidsMap[oldUID];
+          delete this.$mailbox.uidsMap[oldUID];
+        }
       }
     }
   };