diff --git a/mail/.config/mutt/account-uni b/mail/.config/mutt/account-uni
index 4d9156d..eb0586f 100644
--- a/mail/.config/mutt/account-uni
+++ b/mail/.config/mutt/account-uni
@@ -1,16 +1,12 @@
 # Mutt account for jens.mathis.sauer@uni-oldenburg.de
 
-unalternates "*"
-unsubscribe *
-unlists *
-unhook save-hook
-unset imap_authenticators
+source ~/.config/mutt/muttrc
 
 # Personal configuration
 #
-set from = "jens.mathis.sauer@uni-oldenburg.de"
-alternates "^jens.mathis.sauer@uol\.de$"
-set hostname = "uni-oldenburg.de"
+set from = "jens.mathis.sauer@alum.uni-oldenburg.de"
+alternates "^jens.mathis.sauer@alum\.uol\.de$"
+set hostname = "alum.uni-oldenburg.de"
 set pgp_default_key = "0x7D98E633A4FFE8B7"
 
 #
@@ -22,9 +18,11 @@ set record = "=Sent Items"
 set mbox = "=mbox"
 set postponed = "=Drafts"
 set trash = "=Deleted Items"
-set sendmail = "/usr/bin/msmtp -a uni"
 
-account-hook $folder "set imap_user = 'bodu0604' imap_pass = '`gpg --decrypt --quiet --batch ~/.config/mutt/account-uni-pass.asc`'"
+set imap_user = "bodu0604"
+set imap_pass = "`gpg --decrypt --quiet --batch ~/.config/mutt/account-uni-pass.asc`"
+set smtp_url = smtp://$imap_user@smtp.uni-oldenburg.de:587
+set smtp_pass = $imap_pass
 
 #
 # Source confidential settings
diff --git a/shell/.bash_aliases b/shell/.bash_aliases
index a8ed5c9..c933da8 100644
--- a/shell/.bash_aliases
+++ b/shell/.bash_aliases
@@ -1,4 +1,4 @@
 # bash aliases
 
 alias muttg='mutt -F ~/.config/mutt/account-gmail'
-alias mutto='mutt -f imaps://imap.uni-oldenburg.de'
+alias mutto='mutt -F ~/.config/mutt/account-uni'