diff --git a/.vim/ftplugin/mail.vim b/.vim/ftplugin/mail.vim
--- a/.vim/ftplugin/mail.vim
+++ b/.vim/ftplugin/mail.vim
@@ -9,24 +9,11 @@ function! JumpAndInsert()
   endif
 endfunction
 
-function! AutoFmtToggle()
-  if &formatoptions =~ 'a'
-    set fo-=a
-    echo '-a'
-  else
-    set fo+=a
-    echo '+a'
-  endif
-endfunction
-
 augroup mail_filetype
   autocmd!
   autocmd BufReadPost mutt-* :call JumpAndInsert()
 augroup END
 
 setl textwidth=72
-setl formatoptions=aw
+setl formatoptions+=awt12
 setl spell
-
-map <silent> <leader>a :call AutoFmtToggle()<CR>
-imap <silent> <leader>a :call AutoFmtToggle()<CR>