diff --git a/home-mail.nix b/home-mail.nix
index 6c4f00c..82cc3a7 100644
--- a/home-mail.nix
+++ b/home-mail.nix
@@ -10,21 +10,8 @@ in
 
   programs.msmtp.enable = true;
 
-  # programs.neomutt = {
-  #   enable = true;
-  #   sidebar.enable = true;
-  #   sort = "reverse-threads";
-  # };
-
   # programs.himalaya.enable = true;
 
-  programs.aerc = {
-    enable = true;
-    extraConfig = {
-      general = { unsafe-accounts-conf = true; };
-    };
-  };
-
   programs.mu.enable = true;
 
   accounts.email = {
@@ -62,17 +49,15 @@ in
         # };
         mu.enable = true;
         msmtp.enable = true;
-        # neomutt.enable = true;
-        aerc.enable = true;
-        # himalaya = {
-        #   enable = true;
-        #   backend = "maildir";
-        #   sender = "smtp";
-        #   settings = {
-        #     sent-folder = "INBOX.Sent";
-        #     draft-folder = "INBOX.Drafts";
-        #   };
-        # };
+        himalaya = {
+          enable = true;
+          settings = {
+            backend = "maildir";
+            message.send.backend = "smtp";
+            sent-folder = "INBOX.Sent";
+            draft-folder = "INBOX.Drafts";
+          };
+        };
         signature = {
           text = ''Dustin Swan | dustinswan.com'';
           showSignature = "append";