diff --git a/vim/config/after.vim b/vim/config/after.vim
index a557b33..9d07960 100644
--- a/vim/config/after.vim
+++ b/vim/config/after.vim
@@ -19,7 +19,7 @@ if !exists("g:disablelinebreaks")
     let g:disablelinebreaks=1
 endif
 if (g:disablelinebreaks == 1)
-    autocmd VimEnter * set tw=0
+    autocmd VimEnter * set textwidth=0
 endif
 
 "enable omnicompletion for any filetype without that has syntax highlighting
@@ -59,5 +59,6 @@ endif
     autocmd VimEnter * if &diff|wincmd H|endif
 
     "disable the whitespace plugin for vimfiler
-    autocmd BufEnter,FileType vimfiler hi ExtraWhitespace ctermbg=NONE guibg=NONE
+    autocmd BufEnter,FileType vimfiler,mail hi ExtraWhitespace ctermbg=NONE guibg=NONE
+    autocmd BufEnter,FileType mail set textwidth=0
 "}}}
diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim
index 686de92..6169b0e 100644
--- a/vim/config/keyboard.vim
+++ b/vim/config/keyboard.vim
@@ -186,8 +186,8 @@
 "
 "  (formatting)
 "    <Backspace>              | (V) -> deletes currently selected text
-"    <Leader>J                | (N) -> split the line into lines of <=79 chars
-"    <Leader>J                | (V) -> split the selection into lines of <=79 chars
+"    <Leader>J                | (N) -> split document into lines of tw or 80
+"    <Leader>J                | (V) -> split selection into lines of tw or 80
 "    <Leader>f                | (N) -> format document and return to cursor
 "    <Leader>f                | (V) -> format the selection and return to cursor
 "    <Leader>F                | (N) -> format document using :Autoformat