diff --git a/CHANGES b/CHANGES
index dade402a9..799941126 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2635,4 +2635,5 @@
 * ionos profitbricks: add new regions Berlin and Logrono
 * docker: update to 23.0.6
 * network: trusted IPs
+* fix crash when editing quota of new mailboxes
 
diff --git a/dashboard/src/views/email.js b/dashboard/src/views/email.js
index e308c64d7..22278ba3c 100644
--- a/dashboard/src/views/email.js
+++ b/dashboard/src/views/email.js
@@ -64,6 +64,12 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         Client.openSubscriptionSetup($scope.$parent.subscription);
     };
 
+    function updateMailUsage(mailboxName, quotaLimit) {
+        if (!$scope.mailUsage) $scope.mailUsage = {};
+        if (!$scope.mailUsage[mailboxName]) $scope.mailUsage[mailboxName] = {};
+        $scope.mailUsage[mailboxName].quotaLimit = quotaLimit;
+    }
+
     function refreshMailUsage() {
         Client.getMailUsage($scope.domain.domain, function (error, usage) {
             if (error) console.error(error);
@@ -646,7 +652,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
                     }
 
                     function done() {
-                        $scope.mailUsage[$scope.mailboxes.edit.name + '@' + $scope.domain.domain].quotaLimit = $scope.mailboxes.edit.storageQuotaEnabled ? $scope.mailboxes.edit.storageQuota : 0; // hack to avoid refresh
+                        updateMailUsage($scope.mailboxes.edit.name + '@' + $scope.domain.domain, $scope.mailboxes.edit.storageQuotaEnabled ? $scope.mailboxes.edit.storageQuota : 0); // hack to avoid refresh
 
                         $scope.mailboxes.edit.busy = false;
                         $scope.mailboxes.edit.error = null;
diff --git a/src/infra_version.js b/src/infra_version.js
index 22b77c306..62f122624 100644
--- a/src/infra_version.js
+++ b/src/infra_version.js
@@ -20,7 +20,7 @@ exports = module.exports = {
         'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:5.0.6@sha256:94bc17f8e9daf8de01c9676bc6c9ac4d791cc10b1a602d9647a8f545ea5568fc' },
         'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:4.3.7@sha256:6217723c33f1555fdaf5064a4ee87ab582523ac24fe15fafe9838b137e185296' },
         'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:3.5.0@sha256:ee6da2599a72afaec1d80c41db9b5fe79c882fb920195659e871501ea2e94d18' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.8.3@sha256:877a1afb99e8cae8c82d5a2fca77840425eb7fafc24360fdd1c9c299e41bcfeb' },
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.8.4@sha256:a2f20bfed4e5d03d0e7e8da2d5a8e2347836b569f6e81b0c727ce4ca36858764' },
         'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:3.3.0@sha256:005addac7e7576f3960b562404ce59442bc861626af0ae0f5122484f5bfcbbc1' },
         'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:3.7.2@sha256:a6f81d4dbbb90f6d57d30722f860d431cdba67c3500fb327878d29c6bb6357d2' }
     }