diff --git a/.config/mbsync/config b/.config/mbsync/config
index 244335b..0b14d53 100644
--- a/.config/mbsync/config
+++ b/.config/mbsync/config
@@ -25,7 +25,7 @@ ExpireUnread no
 # End Profile
 
 # University
-IMAPStore david.julien@etu.univ-nantes.fr-remote
+IMAPStore david.julien@univ-nantes.fr-remote
 Host imaps.etu.univ-nantes.fr
 Port 993
 User E22D718J
@@ -34,15 +34,15 @@ AuthMechs LOGIN
 SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
-MaildirStore david.julien@etu.univ-nantes.fr-local
+MaildirStore david.julien@univ-nantes.fr-local
 Subfolders Verbatim
-Path /home/swytch/.local/share/mail/david.julien@etu.univ-nantes.fr/
-Inbox /home/swytch/.local/share/mail/david.julien@etu.univ-nantes.fr/INBOX
+Path /home/swytch/.local/share/mail/david.julien@univ-nantes.fr/
+Inbox /home/swytch/.local/share/mail/david.julien@univ-nantes.fr/INBOX
 
-Channel david.julien@etu.univ-nantes.fr
+Channel david.julien@univ-nantes.fr
 Expunge Both
-Far :david.julien@etu.univ-nantes.fr-remote:
-Near :david.julien@etu.univ-nantes.fr-local:
+Far :david.julien@univ-nantes.fr-remote:
+Near :david.julien@univ-nantes.fr-local:
 Patterns * !"[Gmail]/All Mail"
 Create Both
 SyncState *
diff --git a/.config/msmtp/config b/.config/msmtp/config
index 1cfb35f..438caed 100644
--- a/.config/msmtp/config
+++ b/.config/msmtp/config
@@ -9,10 +9,10 @@ tls on
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 logfile /home/swytch/.config/msmtp/msmtp.log
 
-account david.julien@etu.univ-nantes.fr
+account david.julien@univ-nantes.fr
 host smtp.etu.univ-nantes.fr
 port 587
-from david.julien@etu.univ-nantes.fr
+from david.julien@univ-nantes.fr
 user E22D718J
 passwordeval "pass univ-nantes.fr/E22D718J"
 auth on
diff --git a/.config/mutt/accounts/2-david.julien@etu.univ-nantes.fr.muttrc b/.config/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc
similarity index 76%
rename from .config/mutt/accounts/2-david.julien@etu.univ-nantes.fr.muttrc
rename to .config/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc
index f2c0521..2e15aad 100644
--- a/.config/mutt/accounts/2-david.julien@etu.univ-nantes.fr.muttrc
+++ b/.config/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc
@@ -1,16 +1,16 @@
 # vim: filetype=neomuttrc
-# muttrc file for account david.julien@etu.univ-nantes.fr
+# muttrc file for account david.julien@univ-nantes.fr
 set realname = "David JULIEN"
-set from = "david.julien@etu.univ-nantes.fr"
-set sendmail = "msmtp -a david.julien@etu.univ-nantes.fr"
-alias me david.julien <david.julien@etu.univ-nantes.fr>
-set folder = "$XDG_DATA_HOME/mail/david.julien@etu.univ-nantes.fr"
-set header_cache = "$XDG_CACHE_HOME/mutt/david.julien@etu.univ-nantes.fr/headers"
-set message_cachedir = "$XDG_CACHE_HOME/mutt/david.julien@etu.univ-nantes.fr/bodies"
+set from = "david.julien@univ-nantes.fr"
+set sendmail = "msmtp -a david.julien@univ-nantes.fr"
+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/mutt/david.julien@univ-nantes.fr/headers"
+set message_cachedir = "$XDG_CACHE_HOME/mutt/david.julien@univ-nantes.fr/bodies"
 set mbox_type = Maildir
 
 set crypt_autosign = yes
-set pgp_sign_as  = "0x70F6BD57D3BD8027"
+set pgp_sign_as  = "0x1DD6B2BA6DD78810"
 
 bind index,pager gg noop
 bind index,pager g noop
@@ -21,9 +21,9 @@ unmailboxes *
 unalternates *
 set signature="$XDG_CONFIG_HOME/mutt/accounts/nantes.signature"
 unmacro index o
-macro index o "<shell-escape>mailsync<enter>" "run mbsync to sync david.julien@etu.univ-nantes.fr"
+macro index o "<shell-escape>mailsync<enter>" "run mbsync to sync david.julien@univ-nantes.fr"
 
-mailboxes "=Sent" "=Drafts" "=Trash" "=INBOX" "=thesis"
+mailboxes "=Sent" "=Drafts" "=Trash" "=INBOX" "=thesis" "=admin" "=login" "=teaching" "=teaching/X11I020" "=teaching/X11I040"
 set record = "+Sent"
 macro index,pager gs "<change-folder>=Sent<enter>" "go to sent"
 macro index,pager Ms ";<save-message>=Sent<enter>" "move mail to sent"
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index 7c849b7..072ca89 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -2,6 +2,6 @@
 source $XDG_CONFIG_HOME/mutt/neomutt.muttrc
 macro index,pager ip '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/1-david.julien@posteo.net.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to david.julien@posteo.net"
 macro index,pager is '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/2-david.julien@ens-lyon.fr.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to david.julien@ens-lyon.fr"
-macro index,pager in '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/2-david.julien@etu.univ-nantes.fr.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to david.julien@etu.univ-nantes.fr"
+macro index,pager in '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to david.julien@univ-nantes.fr"
 macro index,pager im '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/accounts/3-david.julien@mailo.com.muttrc<enter><change-folder>!<enter>;<check-stats>' "switch to david.julien@mailto.com"
-source $XDG_CONFIG_HOME/mutt/accounts/2-david.julien@etu.univ-nantes.fr.muttrc
+source $XDG_CONFIG_HOME/mutt/accounts/2-david.julien@univ-nantes.fr.muttrc
diff --git a/.config/mutt/neomutt.muttrc b/.config/mutt/neomutt.muttrc
index 5b70109..a000907 100644
--- a/.config/mutt/neomutt.muttrc
+++ b/.config/mutt/neomutt.muttrc
@@ -81,7 +81,9 @@ macro index A "<limit>all\n" "show all messages (undo limit)"
 # Sidebar mappings
 set sidebar_visible = yes
 set sidebar_width = 20
-set sidebar_short_path = yes
+set sidebar_short_path
+set sidebar_folder_indent
+set sidebar_indent_string = " └ "
 set sidebar_next_new_wrap = yes
 set mail_check_stats
 set sidebar_format = '%D%?F? [%F]?%* %?N?%N/? %?S?%S?'
diff --git a/.local/bin/statusbar/sb-mailbox b/.local/bin/statusbar/sb-mailbox
index 860179f..7302bf2 100755
--- a/.local/bin/statusbar/sb-mailbox
+++ b/.local/bin/statusbar/sb-mailbox
@@ -15,8 +15,9 @@ for acc in $(ls "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/)
 do
 	new="$(find "${XDG_DATA_HOME:-$HOME/.local/share}"/mail/$acc/*/new/ -type f | grep -iv "trash" | wc -l 2>/dev/null)"
 	if [ $new -gt 0 ]; then
+                box=""
 		[ -n "$(echo "$acc" | sed -n '/@centrale/p')" ] && box=""
-		[ -n "$(echo "$acc" | sed -n '/@etu/p')" ] && box=""
+		[ -n "$(echo "$acc" | sed -n '/@univ/p')" ] && box=""
 		[ -n "$(echo "$acc" | sed -n '/@mailo/p')" ] && box=""
 		[ -n "$(echo "$acc" | sed -n '/@posteo/p')" ] && box=""
 		unread="$unread/$box$new"