1 files changed, 11 insertions, 7 deletions
diff --git a/aphrodite/mail/default.nix b/aphrodite/mail/default.nix
index c12e79d..84adc8a 100644
--- a/aphrodite/mail/default.nix
+++ b/aphrodite/mail/default.nix
@@ -24,6 +24,10 @@ in {
     systemDomain = domainFqdn;
     systemName = domainFqdn;
     systemContact = "postmaster@${domainFqdn}";
+    workarounds.all = true;
+    hierarchySeparator = "/";
+
+    x509.useACMEHost = config.mailserver.fqdn;
 
     dmarcReporting.enable = true;
     tlsrpt.enable = true;
@@ -34,27 +38,28 @@ in {
     mailboxes = {
       Archive = {
         auto = "subscribe";
-        specialUse = "Archive";
+        special_use = "\\Archive";
       };
       Drafts = {
         auto = "subscribe";
-        specialUse = "Drafts";
+        special_use = "\\Drafts";
       };
       Junk = {
         auto = "subscribe";
-        specialUse = "Junk";
+        special_use = "\\Junk";
       };
       Sent = {
         auto = "subscribe";
-        specialUse = "Sent";
+        special_use = "\\Sent";
       };
       Trash = {
         auto = "subscribe";
-        specialUse = "Trash";
+        fts_autoindex = false;
+        special_use = "\\Trash";
       };
     };
 
-    loginAccounts =
+    accounts =
       lib.mapAttrs (account: cfg: {
         aliases = cfg.aliases;
         aliasesRegexp = cfg.aliasesRegex;
@@ -63,7 +68,6 @@ in {
         sendOnly = cfg.sendOnly;
       })
       config.customOps.mailAccounts;
-    certificateScheme = "acme";
   };
 
   services.roundcube = {