diff --git a/install.sh b/install.sh
index 1de91a4..89bb165 100755
--- a/install.sh
+++ b/install.sh
@@ -12,6 +12,13 @@ function deploy_directory()
 	cd ..
 } # }}}
 
+function deploy_encryption()
+{
+	cd ~
+	mkdir $SECURE_DIR/.mozilla
+	ln -s $SECURE_DIR/.mozilla ~./.mozilla
+}
+
 function deploy_for_desktop()
 { # {{{
 	cd ~
@@ -150,6 +157,7 @@ ln -s $WAI/bashrc ./.bashrc
 ln -s $WAI/bash_ps1 ./.bash_ps1
 
 deploy_for_desktop
+deploy_encryption
 deploy_vim
 deploy_ssh
 deploy_mutt
diff --git a/mailcap b/mailcap
index 2ba50b2..5e3a6e5 100644
--- a/mailcap
+++ b/mailcap
@@ -1,4 +1,4 @@
-image/*; eog %s
+image/*; feh %s
 text/html; lynx -display_charset=utf-8 -dump %s; nametemplate=%s.html; copiousoutput
 audio/*; vlc %s
 application/pdf; evince %s
diff --git a/mutt/account.frank b/mutt/account.frank
index 7648b0f..768d7b3 100644
--- a/mutt/account.frank
+++ b/mutt/account.frank
@@ -17,7 +17,7 @@ my_hdr X-Message-Flag: This message violates the USA PATRIOT Act (HR 3162), sect
 set smtp_pass = $my_frank_smtp_pass
 set imap_pass = $my_frank_imap_pass
 
-folder-hook . 'macro index d "<save-message>+Trash<enter>"'
-folder-hook =trash 'macro index d <delete-message>' 
+folder-hook . 'macro index d "<save-message>=Trash<enter>y"'
+folder-hook =Trash 'macro index d <delete-message>' 
 
 # vim: filetype=muttrc
diff --git a/mutt/muttrc b/mutt/muttrc
index 35b76c4..4f9e5cd 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -15,10 +15,10 @@ folder-hook 'aei@outlook.unige.ch' 'source ~/.mutt/account.aei'
 # switch to default account on startup
 source ~/.mutt/account.frank
 
-set my_frank_smtp_pass=`~/.mutt/unlock-passC.sh frank_smtp`
-set my_frank_imap_pass=`~/.mutt/unlock-passC.sh frank_imap`
-set my_aei_smtp_pass=`~/.mutt/unlock-passC.sh aei_smtp`
-set my_aei_imap_pass=`~/.mutt/unlock-passC.sh aei_imap`
+set my_frank_smtp_pass=`~/.mutt/unlock-pass.sh frank_smtp`
+set my_frank_imap_pass=`~/.mutt/unlock-pass.sh frank_imap`
+set my_aei_smtp_pass=`~/.mutt/unlock-pass.sh aei_smtp`
+set my_aei_imap_pass=`~/.mutt/unlock-pass.sh aei_imap`
 
 
 ### MOTS DE PASSE
diff --git a/mutt/unlock-pass.sh b/mutt/unlock-pass.sh
index fd5a9fa..970f167 100755
--- a/mutt/unlock-pass.sh
+++ b/mutt/unlock-pass.sh
@@ -1,11 +1,17 @@
 #!/bin/bash
 
-PASS_FILE="/dev/shm/$USER-mutt-pass"
-ENC_PASS_FILE=~/.mutt/passwords.gpg
+#Unlock pass - clever version
+
+#On ecryptfs
+PASS_FILE=~/.mutt/passwords_decrypted
+
+#PASS_FILE="/dev/shm/$USER-mutt-pass"
+#ENC_PASS_FILE=~/.mutt/passwords.gpg
 
 if [ ! -s $PASS_FILE ]; then
 	umask 077
 	gpg -d $ENC_PASS_FILE > $PASS_FILE
 fi
 
-cat $PASS_FILE
+cat $PASS_FILE | grep $1 | cut -d"=" -f2
+
diff --git a/vim/vimrc b/vim/vimrc
index 89e00d5..8bfa61b 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,6 +1,6 @@
 " Ma conf vim - Frank
 
-execute pathogen#infect()
+"execute pathogen#infect()
 
 syntax on
 color desert