diff --git a/.muttrc b/.muttrc
--- a/.muttrc
+++ b/.muttrc
@@ -26,9 +26,14 @@ set mailcap_path    = ~/.mutt/mailcap
 set assumed_charset = "utf-8:iso8859-1"
 set autoedit        = yes
 set edit_headers    = yes
-set editor          = "vim +'set tw=72 noawa'"
+set editor          = "vim +'set tw=72 spell' +/^$ +noh ++1"
 set strict_threads  = yes
 
+set reverse_name    = yes
+set envelope_from   = yes
+set fast_reply      = yes
+set include         = yes
+
 set header_cache     = ~/.cache/mutt
 set message_cachedir = ~/.cache/mutt