diff --git a/home/email/default.nix b/home/email/default.nix
index b10e8db2..a3dbb67f 100644
--- a/home/email/default.nix
+++ b/home/email/default.nix
@@ -30,6 +30,15 @@
         aliases = ["evie@xenia.me.uk" "evie@litherlandsmith.slmail.me"];
         userName = address;
         passwordCommand = "${pkgs.pass}/bin/pass show mbsync/${hostName}/proton | head -n1";
+        mu.enable = lib.mkDefault accountEnabled;
+        neomutt.enable = lib.mkDefault accountEnabled;
+        msmtp = {
+          enable = lib.mkDefault accountEnabled;
+          extraConfig = {
+            tls = "off";
+            auth = "login";
+          };
+        };
         mbsync = {
           enable = lib.mkDefault accountEnabled;
           create = "both";
@@ -39,14 +48,10 @@
           subFolders = "Verbatim";
           extraConfig.account.AuthMechs = "LOGIN";
         };
-        msmtp = {
+        notmuch = {
           enable = lib.mkDefault accountEnabled;
-          extraConfig = {
-            tls = "off";
-            auth = "login";
-          };
+          neomutt.enable = true;
         };
-        mu.enable = lib.mkDefault accountEnabled;
       };
       icloud = let
         accountEnabled = true;
@@ -59,6 +64,9 @@
         address = "e.litherlandsmith@icloud.com";
         userName = address;
         passwordCommand = "${pkgs.pass}/bin/pass show mbsync/${hostName}/icloud | head -n1";
+        mu.enable = lib.mkDefault accountEnabled;
+        neomutt.enable = lib.mkDefault accountEnabled;
+        msmtp.enable = lib.mkDefault accountEnabled;
         mbsync = {
           enable = lib.mkDefault accountEnabled;
           create = "both";
@@ -67,8 +75,10 @@
           patterns = ["*" "!Notes"];
           subFolders = "Verbatim";
         };
-        msmtp.enable = lib.mkDefault accountEnabled;
-        mu.enable = lib.mkDefault accountEnabled;
+        notmuch = {
+          enable = lib.mkDefault accountEnabled;
+          neomutt.enable = true;
+        };
       };
       outlook = let
         host = "127.0.0.1";
@@ -90,6 +100,15 @@
         aliases = ["elitherl@jet.uk"];
         userName = address;
         passwordCommand = "${pkgs.pass}/bin/pass show mbsync/${hostName}/outlook | head -n1";
+        mu.enable = lib.mkDefault accountEnabled;
+        neomutt.enable = lib.mkDefault accountEnabled;
+        msmtp = {
+          enable = lib.mkDefault accountEnabled;
+          extraConfig = {
+            tls = "off";
+            auth = "login";
+          };
+        };
         mbsync = {
           enable = lib.mkDefault accountEnabled;
           create = "both";
@@ -106,18 +125,17 @@
           subFolders = "Verbatim";
           extraConfig.account.AuthMechs = "LOGIN";
         };
-        msmtp = {
+        notmuch = {
           enable = lib.mkDefault accountEnabled;
-          extraConfig = {
-            tls = "off";
-            auth = "login";
-          };
+          neomutt.enable = true;
         };
-        mu.enable = lib.mkDefault accountEnabled;
       };
     };
   };
   programs = {
+    # afew.enable = true;
+    # alot.enable = true;
+    neomutt.enable = true;
     mu.enable = true;
     msmtp.enable = true;
     mbsync = {
@@ -128,6 +146,11 @@
         outlook = ["INBOX"];
       };
     };
+    notmuch = {
+      enable = true;
+      new.tags = ["new"];
+      maildir.synchronizeFlags = true;
+    };
   };
   systemd.user.services = let
     emailAccounts = config.accounts.email.accounts;