diff --git a/.config/mbsync/config b/.config/mbsync/config
index 38741eb..856cc3d 100644
--- a/.config/mbsync/config
+++ b/.config/mbsync/config
@@ -10,10 +10,10 @@ CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 MaildirStore david.julien@posteo.net-local
 Subfolders Verbatim
-Path /home/swytch/.local/share/mail/david.julien@posteo.net/
-Inbox /home/swytch/.local/share/mail/david.julien@posteo.net/INBOX
+Path /home/swytch/.local/share/mail/posteo/
+Inbox /home/swytch/.local/share/mail/posteo/INBOX
 
-Channel david.julien@posteo.net
+Channel posteo
 Expunge Both
 Far :david.julien@posteo.net-remote:
 Near :david.julien@posteo.net-local:
@@ -36,10 +36,10 @@ CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 MaildirStore david.julien@univ-nantes.fr-local
 Subfolders Verbatim
-Path /home/swytch/.local/share/mail/david.julien@univ-nantes.fr/
-Inbox /home/swytch/.local/share/mail/david.julien@univ-nantes.fr/INBOX
+Path /home/swytch/.local/share/mail/univ/
+Inbox /home/swytch/.local/share/mail/univ/INBOX
 
-Channel david.julien@univ-nantes.fr
+Channel univ
 Expunge Both
 Far :david.julien@univ-nantes.fr-remote:
 Near :david.julien@univ-nantes.fr-local:
@@ -62,10 +62,10 @@ CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 MaildirStore david.julien@mailo.com-local
 Subfolders Verbatim
-Path /home/swytch/.local/share/mail/david.julien@mailo.com/
-Inbox /home/swytch/.local/share/mail/david.julien@mailo.com/INBOX
+Path /home/swytch/.local/share/mail/mailo/
+Inbox /home/swytch/.local/share/mail/mailo/INBOX
 
-Channel david.julien@mailo.com
+Channel mailo
 Expunge Both
 Far :david.julien@mailo.com-remote:
 Near :david.julien@mailo.com-local:
diff --git a/.config/msmtp/config b/.config/msmtp/config
index 25ea415..4e48a95 100644
--- a/.config/msmtp/config
+++ b/.config/msmtp/config
@@ -1,4 +1,4 @@
-account david.julien@posteo.net
+account posteo
 host posteo.de
 port 587
 from david.julien@posteo.net
@@ -9,7 +9,7 @@ tls on
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 logfile /home/swytch/.config/msmtp/msmtp.log
 
-account david.julien@univ-nantes.fr
+account univ
 host smtp.etu.univ-nantes.fr
 port 587
 from david.julien@univ-nantes.fr
@@ -20,7 +20,7 @@ tls on
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 logfile /home/swytch/.config/msmtp/msmtp.log
 
-account david.julien@mailo.com
+account mailo
 host mail.mailo.com
 port 587
 from david.julien@mailo.com
diff --git a/.config/neomutt/accounts/1-david.julien@posteo.net.muttrc b/.config/neomutt/accounts/1-david.julien@posteo.net.muttrc
index d9adf49..7cc1d88 100644
--- a/.config/neomutt/accounts/1-david.julien@posteo.net.muttrc
+++ b/.config/neomutt/accounts/1-david.julien@posteo.net.muttrc
@@ -2,11 +2,11 @@
 # muttrc file for account email@adress.you
 set realname = "David JULIEN"
 set from = "david.julien@posteo.net"
-set sendmail = "msmtp -a david.julien@posteo.net"
+set sendmail = "msmtp -a posteo"
 alias me david.julien <david.julien@posteo.net>
-set folder = "$XDG_DATA_HOME/mail/david.julien@posteo.net"
-set header_cache = "$XDG_CACHE_HOME/neomutt/david.julien@posteo.net/headers"
-set message_cachedir = "$XDG_CACHE_HOME/neomutt/david.julien@posteo.net/bodies"
+set folder = "$XDG_DATA_HOME/mail/posteo"
+set header_cache = "$XDG_CACHE_HOME/neomutt/posteo/headers"
+set message_cachedir = "$XDG_CACHE_HOME/neomutt/posteo/bodies"
 set mbox_type = Maildir
 
 set crypt_autosign = yes
diff --git a/.config/neomutt/accounts/2-david.julien@univ-nantes.fr.muttrc b/.config/neomutt/accounts/2-david.julien@univ-nantes.fr.muttrc
index 0efc2d5..a889735 100644
--- a/.config/neomutt/accounts/2-david.julien@univ-nantes.fr.muttrc
+++ b/.config/neomutt/accounts/2-david.julien@univ-nantes.fr.muttrc
@@ -2,11 +2,11 @@
 # muttrc file for account david.julien@univ-nantes.fr
 set realname = "David JULIEN"
 set from = "david.julien@univ-nantes.fr"
-set sendmail = "msmtp -a david.julien@univ-nantes.fr"
+set sendmail = "msmtp -a univ"
 alias me david.julien <david.julien@univ-nantes.fr>
-set folder = "$XDG_DATA_HOME/mail/david.julien@univ-nantes.fr"
-set header_cache = "$XDG_CACHE_HOME/neomutt/david.julien@univ-nantes.fr/headers"
-set message_cachedir = "$XDG_CACHE_HOME/neomutt/david.julien@univ-nantes.fr/bodies"
+set folder = "$XDG_DATA_HOME/mail/univ"
+set header_cache = "$XDG_CACHE_HOME/neomutt/univ/headers"
+set message_cachedir = "$XDG_CACHE_HOME/neomutt/univ/bodies"
 set mbox_type = Maildir
 
 set crypt_autosign = yes
diff --git a/.config/neomutt/accounts/3-david.julien@mailo.com.muttrc b/.config/neomutt/accounts/3-david.julien@mailo.com.muttrc
index 74acbd5..f6bf6cf 100644
--- a/.config/neomutt/accounts/3-david.julien@mailo.com.muttrc
+++ b/.config/neomutt/accounts/3-david.julien@mailo.com.muttrc
@@ -2,11 +2,11 @@
 # muttrc file for account email@adress.you
 set realname = "David JULIEN"
 set from = "david.julien@mailo.com"
-set sendmail = "msmtp -a david.julien@mailo.com"
+set sendmail = "msmtp -a mailo"
 alias me david.julien <david.julien@mailo.com>
-set folder = "$XDG_DATA_HOME/mail/david.julien@mailo.com"
-set header_cache = "$XDG_CACHE_HOME/neomutt/david.julien@mailo.com/headers"
-set message_cachedir = "$XDG_CACHE_HOME/neomutt/david.julien@mailo.com/bodies"
+set folder = "$XDG_DATA_HOME/mail/mailo"
+set header_cache = "$XDG_CACHE_HOME/neomutt/mailo/headers"
+set message_cachedir = "$XDG_CACHE_HOME/neomutt/mailo/bodies"
 set mbox_type = Maildir
 
 set crypt_autosign = yes