2 files changed, 5 insertions, 2 deletions
diff --git a/install.sh b/install.sh
index a68cd40..2fb023f 100755
--- a/install.sh
+++ b/install.sh
@@ -67,8 +67,10 @@ fi
 mkdir -p autoload
 ln -s $dir/nvim/vim-plug/plug.vim $dir/nvim/autoload/plug.vim
 
-# Creating temporary file for mutt
+# Creating auxiliary files for mutt
 cd $dir
 mkdir -p mutt/temp
+mkdir -p mutt/cache
+mkdir -p mutt/cache/bodies
 
 echo -e "\n*** Installation successful *** \n"
diff --git a/nvimrc b/nvimrc
index 1b347d5..b72d2eb 100644
--- a/nvimrc
+++ b/nvimrc
@@ -230,10 +230,11 @@ vnoremap , :
 " Neovim specific
 tmap <C-_> <C-\><C-n><C-^>
 nnoremap <C-_> :b term<cr>i
-inoremap <C-_> <Esc><C-^>i
+inoremap <C-_> <Esc>:b term<cr>i
 
 "" Restore cursor position
 augroup autocommands
+    au!
     autocmd BufWritePost *.cpp Neomake!
     autocmd BufReadPost *
                 \ if line("'\"") > 1 && line("'\"") <= line("$") |