diff --git a/vim/.vim/advanced.vim b/vim/.vim/advanced.vim
index 7eec25c..a7df3b0 100644
--- a/vim/.vim/advanced.vim
+++ b/vim/.vim/advanced.vim
@@ -1,5 +1,16 @@
-set tw=72
+set tw=72         " text width for line-break
 set comments=s1:/mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-,fb:*
 set ai!           " auto indent
 set fo+=tcqn      " format options
 
+" delete lines until end
+nmap <C-d> dG1o
+map! <C-d> <ESC>dG1o
+
+" delete current line
+nmap <C-s> ddi
+map! <C-s> <ESC>ddi
+
+" add empty line
+nmap <C-a> 1o
+map! <C-a> <ESC>1o
diff --git a/vim/.vim/astroid.vim b/vim/.vim/astroid.vim
index 2e51deb..6baf447 100644
--- a/vim/.vim/astroid.vim
+++ b/vim/.vim/astroid.vim
@@ -10,19 +10,6 @@ map! <M-c> <ESC>3GA
 nmap <M-b> 4GA
 map! <M-b> <ESC>4GA
 
-" delete lines until end
-nmap <C-d> dG1o
-map! <C-d> <ESC>dG1o
-
-" delete current line
-nmap <C-s> ddi
-map! <C-s> <ESC>ddi
-
-" add empty line
-nmap <C-a> 1o
-map! <C-a> <ESC>1o
-
-
 " Go to first empty line and start insert mode
 execute "normal /^$/\n"
 execute ":startinsert"
diff --git a/vim/.vim/mail.vim b/vim/.vim/mail.vim
new file mode 100644
index 0000000..b395985
--- /dev/null
+++ b/vim/.vim/mail.vim
@@ -0,0 +1,40 @@
+""""" Mail specific setting, auto replacements etc, not depending on mail client
+
+" hide gvim elements
+set guioptions-=m  "remove menu bar
+set guioptions-=T  "remove toolbar
+
+" highlight words for better writing ( http://mashable.com/2015/05/03/words-eliminate-vocabulary/ )
+syn keyword Todo that That went Went honestly Honestly Absolutely absolutely very Very really Really amazing Amazing always Always never Never literally Literally just Just maybe Maybe stuff Stuff things Things thing Thing irregardless Irregardless 
+
+" Some auto replacements for end of mails
+iab _v Viele Grüße<C-M>Max
+iab _vm Viele Grüße<C-M>Max Mehl
+iab _bg Beste Grüße<C-M>Max
+iab _bgm Beste Grüße<C-M>Max Mehl
+iab _b Best,<C-M>Max
+iab _br Best regards,<C-M>Max
+iab _brm Best regards,<C-M>Max Mehl
+
+" highlight CApital LEtter TYpos
+:match Title /\<\u\{2}\l.\{-}\>/
+
+" Auto-replace dumb typos
+iab teh the
+iab MAx Max
+
+"" Spell checking
+setlocal spell spelllang=en_gb   " default: EN spellcheck
+
+" Disable spell check
+nmap <M-c> :setlocal spell!<CR>
+map! <M-c> <ESC>:setlocal spell!<CR>li
+
+" EN spell check
+nmap <M-e> :setlocal spell spelllang=en_gb<CR>
+map! <M-e> <ESC>:setlocal spell spelllang=en_gb<CR>li
+
+" DE spell check
+nmap <M-d> :setlocal spell spelllang=de_20<CR>
+map! <M-d> <ESC>:setlocal spell spelllang=de_20<CR>li
+
diff --git a/vim/.vim/spell/de.utf-8.spl b/vim/.vim/spell/de.utf-8.spl
new file mode 100644
index 0000000..ce93d33
Binary files /dev/null and b/vim/.vim/spell/de.utf-8.spl differ
diff --git a/vim/.vimrc b/vim/.vimrc
index cad1a45..96aad3d 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,6 +1,7 @@
 syn on
 " Enable Ctrl+Backspace deleting the last word
-:imap <C-BS> <C-W>
+imap <C-BS> <C-W>
+set backspace=indent,eol,start  " more powerful backspacing
 
 set nocompatible  " no vi compatible, seems to be good 
 set expandtab     " covert TAB to spaces
@@ -27,7 +28,9 @@ set whichwrap+=<,>,[,]
 
 " ASTROID
 autocmd BufRead /home/max/.cache/astroid/* :source ~/.vim/advanced.vim
+autocmd BufRead /home/max/.cache/astroid/* :source ~/.vim/mail.vim
 autocmd BufRead /home/max/.cache/astroid/* :source ~/.vim/astroid.vim
 
 " Thunderbird
 autocmd BufRead /tmp/*.eml :source ~/.vim/advanced.vim
+autocmd BufRead /tmp/*.eml :source ~/.vim/mail.vim