diff --git a/dwm/config.h b/dwm/config.h
index 3baef39..09c42e4 100644
--- a/dwm/config.h
+++ b/dwm/config.h
@@ -58,7 +58,8 @@ static const Layout layouts[] = {
 static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
 static const char *termcmd[]  = { "roxterm", NULL };
 static const char *webcmd[] = { "firefox", NULL };
-static const char *mailcmd[] = { "thunderbird", NULL };
+//static const char *mailcmd[] = { "thunderbird", NULL };
+static const char *muttcmd[] = {"roxterm", "-e", "mutt", NULL};
 
 //static const char *lockcmd[] = { "xlock", "-mode", "blank", "-startCmd", "~/Programmation/Utils/monitorOff.sh", "-timeout", "15", "-dpmsoff", "1", NULL };
 
@@ -76,7 +77,8 @@ static Key keys[] = {
 	{ MODKEY|ShiftMask,      XK_p,      spawn,          {.v = dmenucmd } },
 	{ MODKEY|ShiftMask,      XK_Return, spawn,          {.v = termcmd } },
 	{ MODKEY|ShiftMask,      XK_f,      spawn,          {.v = webcmd } },
-	{ MODKEY|ShiftMask,      XK_t,      spawn,          {.v = mailcmd } },
+//	{ MODKEY|ShiftMask,      XK_t,      spawn,          {.v = mailcmd } },
+	{ MODKEY|ShiftMask,      XK_m,      spawn,          {.v = muttcmd } },
 	{ MODKEY|ShiftMask,      XK_l,      spawn,          {.v = lockcmd } },
 	{ MODKEY,                XK_b,      togglebar,      {0} },
 	{ MODKEY,                XK_j,      focusstack,     {.i = +1 } }, /* change window focus */
diff --git a/mutt/unlock-pass.sh b/mutt/unlock-pass.sh
index 48bb3fb..fd5a9fa 100755
--- a/mutt/unlock-pass.sh
+++ b/mutt/unlock-pass.sh
@@ -3,7 +3,7 @@
 PASS_FILE="/dev/shm/$USER-mutt-pass"
 ENC_PASS_FILE=~/.mutt/passwords.gpg
 
-if [ ! -e $PASS_FILE ]; then
+if [ ! -s $PASS_FILE ]; then
 	umask 077
 	gpg -d $ENC_PASS_FILE > $PASS_FILE
 fi