From 253c8732b45c632a4925227d00e0c7a9a25b7f67 Mon Sep 17 00:00:00 2001
From: Alberto Berti <alberto@metapensiero.it>
Date: Thu, 25 Jul 2019 17:30:20 +0200
Subject: [PATCH 1/3] Add subaddresses configuration

---
 mail-server/dovecot.nix | 1 +
 mail-server/postfix.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mail-server/dovecot.nix b/mail-server/dovecot.nix
index fed2189..929fcac 100644
--- a/mail-server/dovecot.nix
+++ b/mail-server/dovecot.nix
@@ -136,6 +136,7 @@ in
         }
 
         plugin {
+          reipient_delmiter = +
           sieve_plugins = sieve_imapsieve sieve_extprograms
           sieve = file:/var/sieve/%u/scripts;active=/var/sieve/%u/active.sieve
           sieve_default = file:/var/sieve/%u/default.sieve
diff --git a/mail-server/postfix.nix b/mail-server/postfix.nix
index 19f5e52..b55a8ce 100644
--- a/mail-server/postfix.nix
+++ b/mail-server/postfix.nix
@@ -134,7 +134,7 @@ in
       ''
         # Extra Config
         mydestination =
-
+        recipient_delimiter = +
         smtpd_banner = ${fqdn} ESMTP NO UCE
         disable_vrfy_command = yes
         message_size_limit = ${builtins.toString cfg.messageSizeLimit}

From fad71d9948c39695f361a1cc1a21af3696b8a2af Mon Sep 17 00:00:00 2001
From: Alberto Berti <alberto@metapensiero.it>
Date: Thu, 25 Jul 2019 17:55:01 +0200
Subject: [PATCH 2/3] Fix typo

---
 mail-server/dovecot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-server/dovecot.nix b/mail-server/dovecot.nix
index 929fcac..26944de 100644
--- a/mail-server/dovecot.nix
+++ b/mail-server/dovecot.nix
@@ -136,7 +136,7 @@ in
         }
 
         plugin {
-          reipient_delmiter = +
+          recipient_delmiter = +
           sieve_plugins = sieve_imapsieve sieve_extprograms
           sieve = file:/var/sieve/%u/scripts;active=/var/sieve/%u/active.sieve
           sieve_default = file:/var/sieve/%u/default.sieve

From 0ff81a9593134c9133777bfeb16eb3950ce6bed3 Mon Sep 17 00:00:00 2001
From: Alberto Berti <alberto@metapensiero.it>
Date: Fri, 26 Jul 2019 19:00:32 +0200
Subject: [PATCH 3/3] Make the delimiter configuration work

---
 mail-server/dovecot.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mail-server/dovecot.nix b/mail-server/dovecot.nix
index 26944de..686c390 100644
--- a/mail-server/dovecot.nix
+++ b/mail-server/dovecot.nix
@@ -106,6 +106,9 @@ in
           }
         }
 
+        recipient_delimiter = +
+        lmtp_save_to_detail_mailbox = yes
+
         protocol lmtp {
           mail_plugins = $mail_plugins sieve
         }
@@ -136,7 +139,6 @@ in
         }
 
         plugin {
-          recipient_delmiter = +
           sieve_plugins = sieve_imapsieve sieve_extprograms
           sieve = file:/var/sieve/%u/scripts;active=/var/sieve/%u/active.sieve
           sieve_default = file:/var/sieve/%u/default.sieve