diff --git a/modules/programs/home/mail/accounts.nix b/modules/programs/home/mail/accounts.nix
index 54bc5c3..a17465f 100644
--- a/modules/programs/home/mail/accounts.nix
+++ b/modules/programs/home/mail/accounts.nix
@@ -25,7 +25,6 @@
         userName = "contact";
         realName = "Joy";
         passwordCommand = "cat /run/secrets/contact";
-        # passwordCommand = "sh /home/joy/nix/modules/programs/home/mail/contact.sh";
         imap.host = "mail.joygnu.org";
         smtp.host = "mail.joygnu.org";
       };
diff --git a/modules/programs/home/mail/default.nix b/modules/programs/home/mail/default.nix
index bfc8686..1f88db8 100644
--- a/modules/programs/home/mail/default.nix
+++ b/modules/programs/home/mail/default.nix
@@ -51,6 +51,7 @@ in {
 
   programs.neomutt = {
     enable = true;
+    editor = "hx";
     extraConfig = muttrc;
   };
 
diff --git a/modules/programs/home/mail/muttrc b/modules/programs/home/mail/muttrc
index 97df9f1..63d3e9a 100644
--- a/modules/programs/home/mail/muttrc
+++ b/modules/programs/home/mail/muttrc
@@ -82,7 +82,6 @@ bind index j next-entry
 bind index k previous-entry
 bind attach <return> view-mailcap
 bind attach l view-mailcap
-bind editor <space> noop
 bind index G last-entry
 bind index gg first-entry
 bind pager,attach h exit
@@ -105,7 +104,6 @@ bind index,pager,browser d half-down
 bind index,pager,browser u half-up
 bind index,pager S sync-mailbox
 bind index,pager R group-reply
-bind editor <Tab> complete-query
 
 macro index,pager gi "<change-folder>=Inbox<enter>" "go to inbox"
 macro index,pager Mi ";<save-message>=Inbox<enter>" "move mail to inbox"