diff --git a/vim/filetype.vim b/vim/filetype.vim
new file mode 100644
index 0000000..6391245
--- /dev/null
+++ b/vim/filetype.vim
@@ -0,0 +1,14 @@
+augroup filetypedetect
+  " Mail
+    autocmd BufRead,BufNewFile /tmp/evo* setfiletype mail
+    autocmd FileType mail setlocal colorcolumn=72
+augroup END
+
+
+" Break lines for tex-files
+augroup WrapLineInTeXFile
+    autocmd!
+    autocmd FileType tex setlocal wrap
+    autocmd FileType tex setlocal linebreak
+    autocmd FileType tex setlocal nonumber
+augroup END
diff --git a/nvim/init.vim b/vim/init.vim
similarity index 64%
rename from nvim/init.vim
rename to vim/init.vim
index 115915d..047b44d 100644
--- a/nvim/init.vim
+++ b/vim/init.vim
@@ -1,10 +1,11 @@
-"filetype plugin on
+filetype plugin on
 syntax on
 set number
 set nowrap
 set wildmode=longest,list
 set colorcolumn=80
 :let $NVIM_TUI_ENABLE_TRUE_COLOR=1
+set tabpagemax=500
 
 " Indentation
 set smartindent
@@ -23,12 +24,3 @@ set smartcase
 set listchars=tab:>-,trail:·
 set list
 :nnoremap <silent> <F5> :let _s=@/<Bar>:%s/\s\+$//e<Bar>:let @/=_s<Bar>:nohl<CR>
-
-
-" Break lines for tex-files
-augroup WrapLineInTeXFile
-    autocmd!
-    autocmd FileType tex setlocal wrap
-    autocmd FileType tex setlocal linebreak
-    autocmd FileType tex setlocal nonumber
-augroup END
diff --git a/vimrc b/vim/vimrc
similarity index 66%
rename from vimrc
rename to vim/vimrc
index f83cf90..96605ee 100644
--- a/vimrc
+++ b/vim/vimrc
@@ -23,12 +23,3 @@ set smartcase
 set listchars=tab:>-,trail:·
 set list
 :nnoremap <silent> <F5> :let _s=@/<Bar>:%s/\s\+$//e<Bar>:let @/=_s<Bar>:nohl<CR>
-
-
-" Break lines for tex-files
-augroup WrapLineInTeXFile
-    autocmd!
-    autocmd FileType tex setlocal wrap
-    autocmd FileType tex setlocal linebreak
-    autocmd FileType tex setlocal nonumber
-augroup END