diff --git a/.mutt/muttrc b/.mutt/muttrc
index 249ad5f..a05fbc0 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -1,4 +1,4 @@
-###
+### -*- eval: (git-auto-commit-mode 1) -*-
 # ~/.muttrc
 ###
 
@@ -9,7 +9,7 @@ set message_cachedir = ~/.mutt/cache/bodies  # where to store bodies
 set certificate_file = ~/.mutt/certificates  # where to store certs
 set mailcap_path     = ~/.mutt/mailcap       # entries for filetypes
 set tmpdir           = ~/.mutt/temp          # where to keep temp files
-set editor           = "emacs -nw"
+set editor           = "emacsclient -cx"
 
 # main options
 set mbox_type  = Maildir             # mailbox type