diff --git a/vim/.vimrc b/vim/.vimrc
index 96aad3d..49c7b02 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -16,11 +16,11 @@ imap <C-v> <C-r><C-o>+
 
 " Reformat shortcuts
 nmap  <F1>  gqap    " re-format the current paragraph correctly
-nmap  <F2>  gqqj    " format a line which is too long, and go to the next line
-nmap  <F3>  kgqj    " merge the previous line with the current one, with a correct formatting
+"nmap  <F2>  gqqj    " format a line which is too long, and go to the next line
+"nmap  <F3>  kgqj    " merge the previous line with the current one, with a correct formatting
 map!  <F1>  <ESC>gqapi
-map!  <F2>  <ESC>gqqji
-map!  <F3>  <ESC>kgqji
+"map!  <F2>  <ESC>gqqji
+"map!  <F3>  <ESC>kgqji
 
 " Arrow left moves up line when at position 0
 set whichwrap+=<,>,[,]
@@ -28,8 +28,8 @@ 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
+autocmd BufRead /home/max/.cache/astroid/* :source ~/.vim/mail.vim
 
 " Thunderbird
 autocmd BufRead /tmp/*.eml :source ~/.vim/advanced.vim