diff --git a/mailcap b/mailcap
index 9cb444b..dd5651d 100644
--- a/mailcap
+++ b/mailcap
@@ -1,2 +1,3 @@
 image/*; eog %s
 text/html; lynx -display_charset=utf-8 -dump %s; nametemplate=%s.html; copiousoutput
+audio/*; vlc %s
diff --git a/mutt/crypto b/mutt/crypto
index 94a682f..f55d447 100644
--- a/mutt/crypto
+++ b/mutt/crypto
@@ -40,4 +40,7 @@ set crypt_replysign
 # automatically verify the sign of a message when opened
 set crypt_verify_sig=yes
 
+#For enigmail, or mails who don't have PGP/MIME header
+message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' "exec check-traditional-pgp"
+
 # vim: filetype=muttrc
diff --git a/mutt/muttrc b/mutt/muttrc
index 38fd773..0b7207f 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -94,7 +94,7 @@ source $alias_file
 #macro index,pager  a "<pipe-message>abook --add-email-quiet<return>" "Add this sender to Abook"
 #bind editor        <Tab> complete-query
 
-set date_format="%y-%m-%d %T"
+set date_format="%d-%m-%y %T"
 set index_format="%2C | %Z [%d] %-30.30F (%-4.4c) %s"
 
 set sleep_time=0
diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add
index 20cb721..b49a4cf 100644
--- a/vim/spell/en.utf-8.add
+++ b/vim/spell/en.utf-8.add
@@ -3,3 +3,5 @@ nocompatible
 Villaro
 UTC
 init
+i
+printf
diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl
index f57d077..87c6030 100644
Binary files a/vim/spell/en.utf-8.add.spl and b/vim/spell/en.utf-8.add.spl differ
diff --git a/vim/spell/fr.utf-8.add b/vim/spell/fr.utf-8.add
index 80dc47e..76741db 100644
--- a/vim/spell/fr.utf-8.add
+++ b/vim/spell/fr.utf-8.add
@@ -6,3 +6,12 @@ F36914A
 Enercoop
 exams
 proba
+stranger
+should
+to
+read
+our
+them
+encrypt
+alu
+EDF
diff --git a/vim/spell/fr.utf-8.add.spl b/vim/spell/fr.utf-8.add.spl
index dcf33b6..1fc7c51 100644
Binary files a/vim/spell/fr.utf-8.add.spl and b/vim/spell/fr.utf-8.add.spl differ
diff --git a/xinitrc b/xinitrc
index 44f9af8..88347ce 100644
--- a/xinitrc
+++ b/xinitrc
@@ -22,6 +22,9 @@ $OCTOPUS init-all
 #Java
 wmname LG3D
 
+#Keyboard setup +compose key for "ǒ" for esperanto
+setxkbmap -model pc104 -layout ch -variant fr -option compose:lwin
+
 while true; do
 	$OCTOPUS refresh
 	sleep 50