diff --git a/home/mail.nix b/home/mail.nix
index f6b2730f..06bcbc3c 100644
--- a/home/mail.nix
+++ b/home/mail.nix
@@ -174,7 +174,7 @@ in {
   };
 
   home = {
-    packages = [ pkgs.neomutt sortMail ];
+    packages = [ sortMail ];
     file = let
       mutt_alternates = "@maralorn.de "
         + (builtins.concatStringsSep " " me.alternates);
diff --git a/home/modes.nix b/home/modes.nix
index 1c4d2ed5..41333d3f 100644
--- a/home/modes.nix
+++ b/home/modes.nix
@@ -66,20 +66,20 @@ in {
         ./firefox.nix
         ./git-sign.nix
         ./laptop.nix
+        ./mail.nix
+        ./update_tasks.nix
       ]);
   in {
     communication = apolloConfig [
-      ./mail.nix
-      ./update_tasks.nix
+      ./mail-client.nix
       ./chat.nix
       (setStartpage "https://cloud.maralorn.de/apps/calendar")
       (makeBlock [ ])
     ];
     orga = apolloConfig [
+      ./mail-client.nix
       ./accounting.nix
-      ./mail.nix
       ./pythia.nix
-      ./update_tasks.nix
       (setStartpage "https://cloud.maralorn.de/apps/calendar")
       (makeBlock (tinkerPages ++ leisurePages))
     ];
@@ -90,7 +90,7 @@ in {
     ];
 
     tinkering = apolloConfig [
-      ./mail.nix
+      ./mail-client.nix
       ./update-script.nix
       ./tinkering.nix
       ./chat.nix
diff --git a/home/neovim/default.nix b/home/neovim/default.nix
index 519a670e..b65dbe02 100644
--- a/home/neovim/default.nix
+++ b/home/neovim/default.nix
@@ -86,5 +86,6 @@ in {
   home = {
     file.".config/nvim/coc-settings.json".text = builtins.toJSON cocSettings;
     packages = [ neovim ];
+    sessionVariables.EDITOR = "${neovim}/bin/nvim";
   };
 }