diff --git a/hosts/falkenstein/modules/backup/default.nix b/hosts/falkenstein/modules/backup/default.nix
index db55135..3ef84b6 100644
--- a/hosts/falkenstein/modules/backup/default.nix
+++ b/hosts/falkenstein/modules/backup/default.nix
@@ -10,6 +10,8 @@
       source_directories = [
         "/var/lib"
         "/var/log"
+        "/var/mail"
+        "/var/sieve"
         "/root"
       ];
 
diff --git a/hosts/falkenstein/modules/mail/dovecot2.nix b/hosts/falkenstein/modules/mail/dovecot2.nix
index 4a4cd97..256cde2 100644
--- a/hosts/falkenstein/modules/mail/dovecot2.nix
+++ b/hosts/falkenstein/modules/mail/dovecot2.nix
@@ -13,7 +13,7 @@ in
       enableImap = true;
       enableQuota = false;
       enableLmtp = true;
-      mailLocation = "maildir:~/Maildir";
+      mailLocation = "maildir:/var/mail/%n";
       sslServerCert = "/var/lib/acme/${hostname}/fullchain.pem";
       sslServerKey = "/var/lib/acme/${hostname}/key.pem";
       protocols = [ "imap" "sieve" ];
@@ -114,6 +114,9 @@ in
           }
           client_limit = 1
         }
+        plugin {
+          sieve = file:/var/sieve/%u;active=/var/sieve/%u.sieve
+        }
       '';
     };
   };
diff --git a/hosts/falkenstein/modules/mail/postfix.nix b/hosts/falkenstein/modules/mail/postfix.nix
index 7246361..cbc6856 100644
--- a/hosts/falkenstein/modules/mail/postfix.nix
+++ b/hosts/falkenstein/modules/mail/postfix.nix
@@ -36,7 +36,7 @@ in
       sslCert = "/var/lib/acme/${hostname}/fullchain.pem";
       sslKey = "/var/lib/acme/${hostname}/key.pem";
       config = {
-        home_mailbox = "Maildir/";
+        # home_mailbox = "Maildir/";
         smtp_helo_name = config.networking.fqdn;
         smtpd_banner = "${config.networking.fqdn} ESMTP $mail_name";
         smtp_use_tls = true;