diff --git a/src/js/client.js b/src/js/client.js
index 53e347569..00793ac78 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -2842,7 +2842,9 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
             name: name,
             ownerId: ownerId,
             ownerType: ownerType,
-            active: true
+            active: true,
+            storageQuota: 0,
+            messagesQuota: 0
         };
 
         post('/api/v1/mail/' + domain + '/mailboxes', data, null, function (error, data, status) {
diff --git a/src/translation/en.json b/src/translation/en.json
index 15b181bf1..59b76895a 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -1292,7 +1292,8 @@
             "aliases": "Aliases",
             "noAliases": "No aliases are configured.",
             "addAliasAction": "Add an alias",
-            "addAnotherAliasAction": "Add another alias"
+            "addAnotherAliasAction": "Add another alias",
+            "enableStorageQuota": "Enable Storage Quota"
         },
         "deleteMailboxDialog": {
             "title": "Delete mailbox {{ name }}@{{ domain }}",
@@ -1794,5 +1795,10 @@
         "mounts": {
             "description": "Apps can access mounted <a href=\"/#/volumes\">volumes</a> via <code>/media/{volume name}</code> directory. This data is not included in the app's backup."
         }
+    },
+    "mailboxes": {
+        "edit": {
+            "unlimitedStorageQuota": "Unlimited"
+        }
     }
 }
diff --git a/src/translation/nl.json b/src/translation/nl.json
index 3f3c44f07..ea067a0cf 100644
--- a/src/translation/nl.json
+++ b/src/translation/nl.json
@@ -18,7 +18,7 @@
         "tagsFilterHeader": "Tags: {{ tags }}",
         "stateFilterHeader": "Alle statussen",
         "searchPlaceholder": "Zoek Apps",
-        "groupsFilterHeader": "Selecteer groep",
+        "groupsFilterHeader": "Alle groepen",
         "auth": {
             "nosso": "Log in met specifiek account",
             "sso": "Log in met Cloudron aanmeldgegevens",
diff --git a/src/translation/ru.json b/src/translation/ru.json
index 233e727c0..49538b0dd 100644
--- a/src/translation/ru.json
+++ b/src/translation/ru.json
@@ -22,11 +22,14 @@
         "tagsFilterHeader": "Метки: {{ tags }}",
         "tagsFilterHeaderAll": "Все метки",
         "domainsFilterHeader": "Все домены",
-        "groupsFilterHeader": "Выберите группу",
+        "groupsFilterHeader": "Все группы",
         "stateFilterHeader": "Все состояния",
         "addAppAction": "Добавить приложение",
         "addAppproxyAction": "Добавить Appproxy",
-        "addApplinkAction": "Добавить Applink"
+        "addApplinkAction": "Добавить Applink",
+        "filter": {
+            "clearAll": "Очистить все"
+        }
     },
     "main": {
         "offline": "Cloudron недоступен. Переподключение…",
@@ -139,7 +142,8 @@
             "manualWarning": "Вручную добавьте A запись для <b> {{ location }}</b>, указав публичный IP Вашего Cloudron",
             "userManagementMailbox": "Все пользователи этого Cloudron с почтовым ящиком имеют доступ.",
             "installAction": "Установить",
-            "titleAndVersion": "Приложение {{ title }} {{ version }}"
+            "titleAndVersion": "Приложение {{ title }} {{ version }}",
+            "portReadOnly": "Только для чтения"
         },
         "accountDialog": {
             "intendedUse": "Цель использования",
diff --git a/src/views/email.html b/src/views/email.html
index 2aaabf7d3..7268e0f8e 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -152,6 +152,18 @@
             </div>
           </div>
 
+          <div class="form-group">
+            <label for="storageQuota">
+              <input id="storageQuota" type="checkbox" ng-model="mailboxes.edit.storageQuotaEnabled">
+                {{ 'email.editMailboxDialog.enableStorageQuota' | tr }}: <b ng-hide="!mailboxes.edit.storageQuotaEnabled">{{ mailboxes.edit.storageQuota | prettyByteSize }}</b>
+                <b ng-hide="mailboxes.edit.storageQuotaEnabled">{{ 'mailboxes.edit.unlimitedStorageQuota' | tr }}</b>
+              </input>
+            </label>
+            <div style="padding: 0 10px;">
+              <slider id="storageQuota" ng-disabled="!mailboxes.edit.storageQuotaEnabled" ng-model="mailboxes.edit.storageQuota" step="134217728" tooltip="hide" ticks="storageQuotaTicks" ticks-snap-bounds="67108864"></slider>
+            </div>
+          </div>
+
           <div class="checkbox">
             <label>
               <input type="checkbox" ng-model="mailboxes.edit.enablePop3"> {{ 'email.updateMailboxDialog.enablePop3' | tr }}</input>
diff --git a/src/views/email.js b/src/views/email.js
index 8bbb378f2..9c79e969a 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -42,6 +42,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
     $scope.domain = null;
     $scope.adminDomain = null;
     $scope.diskUsage = {};
+    $scope.storageQuotaTicks = [ 5*1024*1024, 10*1024*1024, 100*1024*1024, 500*1024*1024, 1024*1024*1024, 5*1024*1024*1024, 15*1024*1024*1024, 25*1024*1024*1024 ];
 
     $scope.expectedDnsRecords = {
         mx: { },
@@ -571,6 +572,8 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             aliasesOriginal: [],
             active: true,
             enablePop3: false,
+            storageQuota: 0,
+            storageQuotaEnabled: false,
 
             addAlias: function (event) {
                 event.preventDefault();
@@ -597,6 +600,8 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
                 $scope.mailboxes.edit.aliases = angular.copy(mailbox.aliases, []).map(function (a) { a.reversedSortingNotation = a.domain + '@' + a.name; return a; });
                 $scope.mailboxes.edit.active = mailbox.active;
                 $scope.mailboxes.edit.enablePop3 = mailbox.enablePop3;
+                $scope.mailboxes.edit.storageQuotaEnabled = !!mailbox.storageQuota;
+                $scope.mailboxes.edit.storageQuota = mailbox.storageQuota || $scope.storageQuotaTicks[0];
 
                 // make a copy for later comparison
                 angular.copy($scope.mailboxes.edit.aliases, $scope.mailboxes.edit.aliasesOriginal);
@@ -611,7 +616,9 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
                     ownerId: $scope.mailboxes.edit.owner.id,
                     ownerType: $scope.mailboxes.edit.owner.type,
                     active: $scope.mailboxes.edit.active,
-                    enablePop3: $scope.mailboxes.edit.enablePop3
+                    enablePop3: $scope.mailboxes.edit.enablePop3,
+                    storageQuota: $scope.mailboxes.edit.storageQuotaEnabled ? $scope.mailboxes.edit.storageQuota : 0,
+                    messagesQuota: 0
                 };
 
                 // $scope.mailboxes.edit.owner is expected to be validated by the UI