diff --git a/.muttrc b/.muttrc
--- a/.muttrc
+++ b/.muttrc
@@ -28,9 +28,10 @@ set mailcap_path    = ~/.mutt/mailcap
 set assumed_charset = "utf-8:iso8859-1"
 set autoedit        = yes
 set edit_headers    = yes
-set editor          = "exec vim +'set tw=72 spell' +/^$ +noh ++1"
+set editor          = "exec vim"
 set strict_threads  = yes
 
+set text_flowed     = yes
 set reverse_name    = yes
 set envelope_from   = yes
 set fast_reply      = yes