diff --git a/docs/functional.md b/docs/functional.md
index cc2248e0..8e619b0d 100644
--- a/docs/functional.md
+++ b/docs/functional.md
@@ -26,6 +26,7 @@ The following categories are available. Each category contains a set of options
 * Portal options (`functional.portal.*`): Options to customize the openDesk portal, e.g. if the login dialog should be enforced.
 * Chat options (`functional.chat.*`): Configuration options for the chat component of openDesk.
 * Migration options (`functional.migration.*`): Helpful setting(s) for migration scenarios.
+* Groupware options (`functional.groupware.*`): Options to customize Open-Xchange and mail settings, e.g. mail quota.
 
 ## Customization of functional options
 
diff --git a/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl b/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl
index f54e8f45..4d4cfca1 100644
--- a/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl
@@ -37,6 +37,7 @@ dovecot:
     dn: "uid=ldapsearch_dovecot,cn=users,{{ .Values.ldap.baseDn }}"
     password:
       value: {{ .Values.secrets.nubus.ldapSearch.dovecot | quote }}
+  loginTrustedNetworks: {{ join " " .Values.cluster.networking.cidr | quote }}
   oidc:
     enabled: true
     clientID:
@@ -46,7 +47,11 @@ dovecot:
     introspectionHost: {{ printf "%s.%s" .Values.global.hosts.keycloak .Values.global.domain | quote }}
     introspectionPath: "/realms/{{ .Values.platform.realm }}/protocol/openid-connect/token/introspect"
     usernameAttribute: "opendesk_username"
-  loginTrustedNetworks: {{ join " " .Values.cluster.networking.cidr | quote }}
+  quotaRules:
+    - "*:storage={{ mul .Values.functional.groupware.quota.default 1024 }}M"
+    - "Trash:storage=+{{ div (mul (mul .Values.functional.groupware.quota.default 1024) 20) 100 }}M"
+    - "LAZY_EXPUNGE:ignore"
+  quotaGrace: "{{ div (mul (mul .Values.functional.groupware.quota.default 1024) 10) 100 }}M"
   sieve:
     notify:
       mailtoEnvelopeFrom: "orig_recipient"
diff --git a/helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl b/helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl
index 9a1ff7d2..d3bbf919 100644
--- a/helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl
+++ b/helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl
@@ -6,7 +6,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "zendis/opendesk-enterprise/components/product-development/charts/opendesk-dovecot-pro"
     name: "dovecot"
-    version: "3.1.6"
+    version: "3.1.7"
     verify: true
   oxAppSuite:
     registry: "registry.opencode.de"
diff --git a/helmfile/environments/default/charts.yaml.gotmpl b/helmfile/environments/default/charts.yaml.gotmpl
index 8da5e22f..ed77347a 100644
--- a/helmfile/environments/default/charts.yaml.gotmpl
+++ b/helmfile/environments/default/charts.yaml.gotmpl
@@ -97,7 +97,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-dovecot"
     name: "dovecot"
-    version: "3.1.4"
+    version: "3.1.5"
     verify: true
   element:
     # providerCategory: "Platform"
diff --git a/helmfile/environments/default/functional.yaml.gotmpl b/helmfile/environments/default/functional.yaml.gotmpl
index 9324faae..65359987 100644
--- a/helmfile/environments/default/functional.yaml.gotmpl
+++ b/helmfile/environments/default/functional.yaml.gotmpl
@@ -100,7 +100,7 @@ functional:
 
   filestore:
     quota:
-      # Set the default quota for all users in GB
+      # Set the default quota for all users in gigabyte
       default: 1
     # Options related to file sharing.
     # Changing these options might require a restart of the `opendesk-nextcloud-php` Pod(s).
@@ -152,6 +152,11 @@ functional:
       # - https://<.Values.global.hosts.openxchangeDav>.<.Values.global.domain>/carddav/[folderId]"
       # Can be switched off using the below feature toggle.
       enabled: true
+    quota:
+      # Set the default mail storage quota for users in gigabyte.
+      # Just provide the plain number without quoting. It will allow a quote grace of 10% and +20% in trash storage.
+      # If you need different rules you can use customizing on Dovecot's `quotaRules` and `quotaGrace` templating.
+      default: 1
 
   migration:
     oxAppSuite: