diff --git a/NEWS b/NEWS
index a0d6beebf..bce1196f0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+3.1.2 (2016-MM-DD)
+------------------
+
+Bug fixes
+ - [web] fixed error handling when renaming a mailbox
+
 3.1.1 (2016-06-02)
 ------------------
 
diff --git a/UI/WebServerResources/js/Mailer/Mailbox.service.js b/UI/WebServerResources/js/Mailer/Mailbox.service.js
index b5224eec2..ed4bd8e32 100644
--- a/UI/WebServerResources/js/Mailer/Mailbox.service.js
+++ b/UI/WebServerResources/js/Mailer/Mailbox.service.js
@@ -726,8 +726,8 @@
       _this.$shadowData = _this.$omit();
       Mailbox.$log.debug(JSON.stringify(data, undefined, 2));
       return data;
-    }, function(data) {
-      Mailbox.$log.error(JSON.stringify(data, undefined, 2));
+    }, function(response) {
+      Mailbox.$log.error(JSON.stringify(response.data, undefined, 2));
       // Restore previous version
       _this.$reset();
     });
@@ -750,15 +750,7 @@
    * @return an object literal copy of the Mailbox instance
    */
   Mailbox.prototype.$omit = function() {
-    var mailbox = {};
-    angular.forEach(this, function(value, key) {
-      if (key != 'constructor' &&
-          key != 'children' &&
-          key[0] != '$') {
-        mailbox[key] = value;
-      }
-    });
-    return mailbox;
+    return { name: this.name };
   };
 
   /**