diff --git a/hosts/mail/modules/dovecot.nix b/hosts/mail/modules/dovecot.nix
index 3c23a36..dd0e918 100644
--- a/hosts/mail/modules/dovecot.nix
+++ b/hosts/mail/modules/dovecot.nix
@@ -193,7 +193,6 @@ in
         managesieve_logout_format = bytes ( in=%i : out=%o )
       }
 
-      recipient_delimiter = +
       lda_original_recipient_header = X-Original-To
 
       plugin {
diff --git a/hosts/mail/modules/openldap.nix b/hosts/mail/modules/openldap.nix
index 26bf1c5..15892ec 100644
--- a/hosts/mail/modules/openldap.nix
+++ b/hosts/mail/modules/openldap.nix
@@ -290,10 +290,10 @@ in
         ];
       };
 
-      "olcDatabase={5}mdb".attrs = {
+      "olcDatabase={10}mdb".attrs = {
         objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ];
 
-        olcDatabase = "{5}mdb";
+        olcDatabase = "{10}mdb";
         olcDbDirectory = "/var/lib/openldap/data";
 
         olcSuffix = "dc=docfast,dc=dev";
diff --git a/hosts/mail/modules/postfix.nix b/hosts/mail/modules/postfix.nix
index bc9d8ee..ac71d35 100644
--- a/hosts/mail/modules/postfix.nix
+++ b/hosts/mail/modules/postfix.nix
@@ -125,7 +125,6 @@ in
       # The extra detail makes trouble shooting easier but also reveals information
       # that is nobody elses business.
       show_user_unknown_table_name = "no";
-      recipient_delimiter = "+";
       compatibility_level = "2";
 
       # bigger attachement size