diff --git a/mail_system/tasks/database.yml b/mail_system/tasks/database.yml
index 783a47c..031c1a3 100644
--- a/mail_system/tasks/database.yml
+++ b/mail_system/tasks/database.yml
@@ -34,8 +34,8 @@
     - password VARCHAR(128) NOT NULL
     - suspend_submission BOOL NOT NULL DEFAULT false
     - suspend_imap_reason TEXT NULL
-    - quota_storage_bytes BIGINT NOT NULL DEFAULT 100000000000
-    - quota_inbox_messages INT NOT NULL DEFAULT 500000
+    - quota_storage_bytes BIGINT NOT NULL DEFAULT {{ mailserver.dovecot.mailbox_max_bytes | default(100000000000) }}
+    - quota_inbox_messages INT NOT NULL DEFAULT {{ mailserver.dovecot.mailbox_max_messages | default(500000) }}
     - unique(domain_id, username)
 
 - name: database index users__domain_username
diff --git a/mail_system/templates/dovecot/90-quota.conf b/mail_system/templates/dovecot/90-quota.conf
index d05722e..5e80818 100644
--- a/mail_system/templates/dovecot/90-quota.conf
+++ b/mail_system/templates/dovecot/90-quota.conf
@@ -91,14 +91,14 @@ plugin {
   quota_status_success = DUNNO
   quota_status_nouser = DUNNO
   quota_status_overquota = "552 5.2.2 Mailbox is full"
-  quota_exceeded_message = Quota exceeded, please reduce your your overall mail volume and/or the number of messages in your inbox.
+  quota_exceeded_message = Quota exceeded, please reduce your overall mail volume and/or the number of messages in your inbox.
 
   # https://wiki2.dovecot.org/Quota/Configuration
   # https://wiki2.dovecot.org/Quota/Count
   quota = count:User quota
-  quota_rule = *:storage=80G
+  quota_rule = *:storage={{ mailserver.dovecot.mailbox_max_bytes | default(100000000000) }}
   # ATTENTION: the following rule counts all messages in the mailbox, not just in the inbox
-  quota_rule2 = INBOX:messages=+500000
+  quota_rule2 = INBOX:messages=+{{ mailserver.dovecot.mailbox_max_messages | default(500000) }}
   quota_rule3 = Trash:storage=+200M
 
   # https://wiki2.dovecot.org/Quota/Count