diff --git a/home/modules/mail/default.nix b/home/modules/mail/default.nix
index f6dba07..3f73a72 100644
--- a/home/modules/mail/default.nix
+++ b/home/modules/mail/default.nix
@@ -5,8 +5,7 @@ let
   makeConfig = accountName:
     ''
       unset reverse_name
-      unset crypt_auto_pgp
-      unset crypt_auto_smime
+      unset smime_is_default
       set my_account='${ accountName }'
       macro index,pager / "<vfolder-from-query>tag:${ accountName } "
       unalternates *
@@ -88,7 +87,7 @@ in
           extraConfig = makeConfig name + ''
             color status blue default
             alternates ^tstraube@(em|rz)?.uni-frankfurt.de$
-            set crypt_auto_smime
+            set smime_is_default
           '';
         };
       };
@@ -108,7 +107,6 @@ in
             color status green default
             alternates @t9e.me$ @ktiu.net$ ^(tillkowski|till.straube)@gmail.com$
             set reverse_name
-            set crypt_auto_pgp
           '';
         };
         msmtp.extraConfig.port = "587";
@@ -128,7 +126,6 @@ in
         neomutt = {
           extraConfig = makeConfig name + ''
             color status red default
-            set crypt_auto_pgp
           '';
         };
         passwordCommand = "pass ksh/systemli";
@@ -176,7 +173,7 @@ in
     settings = {
       abort_noattach = "ask-yes";
       abort_noattach_regex = "\"(attach|enclosed|anbei|anhängen|angehängt|anhang|anhänge|hängt an)\"";
-      auto_edit = "yes";
+      auto_edit = "no";
       beep = "no";
       confirm_append = "no";
       crypt_auto_sign = "yes";
@@ -220,7 +217,7 @@ in
       { key = "k"; map = [ "pager" ]; action = "previous-entry"; }
       { key = "j"; map = [ "pager" ]; action = "next-entry"; }
       { key = "<return>"; map = [ "index" ]; action = "display-message"; }
-      { key = "<space>"; map = "index"; action = "entire-thread"; }
+      { key = "<space>"; map = [ "index" ]; action = "entire-thread"; }
       { key = "gf"; map = [ "index" "pager" ]; action = "change-folder"; }
       { key = "<Tab>"; map = [ "editor" ]; action = "complete-query"; }
       { key = "P"; map = [ "compose" ]; action = "pgp-menu"; }