diff --git a/mail/.config/mutt/account-gmail b/mail/.config/mutt/account-gmail
index 3c0077b..c1a635d 100644
--- a/mail/.config/mutt/account-gmail
+++ b/mail/.config/mutt/account-gmail
@@ -1,10 +1,7 @@
 # Mutt account for jsauer65@gmail.com
 
-unalternates "*"
-unsubscribe *
-unlists *
-unhook save-hook
 unset record
+source ~/.config/mutt/muttrc
 
 #
 # Personal configuration
@@ -17,15 +14,17 @@ set pgp_default_key = "0x850E29085C0B0084"
 # Gmail configuration
 #
 set hostname = "gmail.com"
-set folder = "imaps://imap.gmail.com"
+set folder = "imaps://jsauer65@gmail.com@imap.gmail.com"
 set spoolfile = "+INBOX"
 set mbox = "+mbox"
 #set postponed = +postponed
 set trash = '+[Google Mail]/Papierkorb'
 set imap_authenticators = "plain"
-
-account-hook $folder "set imap_user = 'jsauer65@gmail.com' imap_pass = '`gpg --decrypt --quiet --batch ~/.config/mutt/account-gmail-pass.asc`'"
-set sendmail = "/usr/bin/msmtp -a gmail"
+set smtp_authenticators = "plain"
+set imap_user = "jsauer65@gmail.com"
+set imap_pass = "`gpg --decrypt --quiet --batch ~/.config/mutt/account-gmail-pass.asc`"
+set smtp_pass = $imap_pass
+set smtp_url=smtp://$imap_user@smtp.gmail.com:587
 
 #
 # Load confidential settings
diff --git a/shell/.bash_aliases b/shell/.bash_aliases
index e6de3ac..a8ed5c9 100644
--- a/shell/.bash_aliases
+++ b/shell/.bash_aliases
@@ -1,4 +1,4 @@
 # bash aliases
 
-alias muttg='mutt -f imaps://imap.gmail.com'
+alias muttg='mutt -F ~/.config/mutt/account-gmail'
 alias mutto='mutt -f imaps://imap.uni-oldenburg.de'