diff --git a/vim/config/after.vim b/vim/config/after.vim
index 68af7a0..adb0ed8 100644
--- a/vim/config/after.vim
+++ b/vim/config/after.vim
@@ -46,8 +46,8 @@ autocmd FileChangedRO * nested set noreadonly
 
     "filtype specific settings
     autocmd BufEnter,FileType sh setlocal iskeyword-=.
-    autocmd Filetype text,markdown,mkdc,gitcommit,notes,mail,notmuch,rst,taskreport setlocal nonumber spell nolist linebreak tabstop=2 shiftwidth=2 breakat&vim breakat-=* breakat-=. breakat-=/ breakat-=? breakat-=, breakat-=: breakat-=; breakat-=! "set some defaults for word processing
-    autocmd Filetype text,gitcommit,notes,mail,notmuch,rst,taskreport setlocal wrap
+    autocmd Filetype text,markdown,gitcommit,mail setlocal nonumber spell nolist linebreak tabstop=2 shiftwidth=2 breakat&vim breakat-=* breakat-=. breakat-=/ breakat-=? breakat-=, breakat-=: breakat-=; breakat-=! "set some defaults for word processing
+    autocmd Filetype text,gitcommit,mail setlocal wrap
     autocmd FileType tmux,taskrc setlocal commentstring=#\ %s "set the comment string to #
     autocmd FileType slrnrc setlocal commentstring=%%\ %s "set the comment string to %
 
@@ -65,5 +65,4 @@ autocmd FileChangedRO * nested set noreadonly
 
     "disable the whitespace plugin for vimfiler
     autocmd BufEnter,FileType vimfiler,mail hi ExtraWhitespace ctermbg=NONE guibg=NONE
-    autocmd BufEnter,FileType mail set textwidth=0
 "}}}