diff --git a/src/views/email.js b/src/views/email.js
index d818e15bb..5c17f02c0 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -638,7 +638,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
                     }
 
                     function done() {
-                        $scope.diskUsage[$scope.mailboxes.edit.name + '@' + $scope.domain.domain].quotaLimit = $scope.mailboxes.edit.storageQuotaEnabled ? $scope.mailboxes.edit.storageQuota/1000 : 0; // hack to avoid refresh
+                        $scope.diskUsage[$scope.mailboxes.edit.name + '@' + $scope.domain.domain].quotaLimit = $scope.mailboxes.edit.storageQuotaEnabled ? $scope.mailboxes.edit.storageQuota : 0; // hack to avoid refresh
 
                         $scope.mailboxes.edit.busy = false;
                         $scope.mailboxes.edit.error = null;
@@ -711,8 +711,8 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
                     var u = $scope.diskUsage[m.name + '@' + m.domain]; // this is unset when no emails have been received yet
                     if (!u) u = $scope.diskUsage[m.name + '@' + m.domain] = { quotaValue: 0, quotaLimit: 0 }; // ensure value
 
-                    m.usage = u.quotaValue * 1000;
-                    m.limit = u.quotaLimit * 1000;
+                    m.usage = u.quotaValue;
+                    m.limit = u.quotaLimit;
                 });
 
                 $scope.mailboxes.mailboxes = mailboxes;
diff --git a/src/views/emails.js b/src/views/emails.js
index 24d88aff3..2133f78a2 100644
--- a/src/views/emails.js
+++ b/src/views/emails.js
@@ -436,7 +436,7 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
                         if (error) return console.error('Failed to fetch usage for domain', domain.domain, error);
 
                         domain.usage = 0;
-                        Object.keys(usage).forEach(function (m) { domain.usage += (usage[m].quotaValue * 1024); });
+                        Object.keys(usage).forEach(function (m) { domain.usage += (usage[m].quotaValue); });
                     });
                 });
             });