diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 5fcae94..7c3554b 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -428,6 +428,10 @@ set noshowmode
 highlight ColorColumn ctermbg=magenta
 call matchadd('ColorColumn', '\%81v', 100)
 
+" Special setting for editing gopass files - make sure nothing leaks outside
+" the directories it is supposed to
+au BufNewFile,BufRead /dev/shm/gopass.* setlocal noswapfile nobackup noundofile
+
 " }}}
 " KEYBINDINGS {{{
 " ================================================================================
@@ -606,7 +610,7 @@ iabbrev whit with
 iabbrev whith with
 
 " Text expansion
-iabbrev @@ marty.oehme@gmail.com
+iabbrev @e@ marty.oehme@gmail.com
 iabbrev ccopy Copyright 2019 Marty Oehme, all rights reserved.
 
 "