From d07e254026f8f35c387d3fd552a1dc74b591456b Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 30 Sep 2015 11:29:05 -0400
Subject: [PATCH] (js) Simplify Mailbox service

---
 .../js/Mailer/Mailbox.service.js               | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/UI/WebServerResources/js/Mailer/Mailbox.service.js b/UI/WebServerResources/js/Mailer/Mailbox.service.js
index 0e92cd3b4..6e0011a48 100644
--- a/UI/WebServerResources/js/Mailer/Mailbox.service.js
+++ b/UI/WebServerResources/js/Mailer/Mailbox.service.js
@@ -493,19 +493,13 @@
    * @returns a promise of the HTTP operation
    */
   Mailbox.prototype.$delete = function() {
-    var _this = this,
-        deferred = Mailbox.$q.defer(),
-        promise;
+    var _this = this;
 
-    promise = Mailbox.$$resource.remove(this.id);
-
-    promise.then(function() {
-      _this.$account.$getMailboxes({reload: true});
-      deferred.resolve(true);
-    }, function(data, status) {
-      deferred.reject(data);
-    });
-    return deferred.promise;
+    return Mailbox.$$resource.remove(this.id)
+      .then(function() {
+        _this.$account.$getMailboxes({reload: true});
+        return true;
+      });
   };
 
   /**