diff --git a/.bashrc b/.bashrc
index 5a3c284..65ed348 100644
--- a/.bashrc
+++ b/.bashrc
@@ -4,8 +4,7 @@ export GOPATH="/home/thrrgilag/go"
 export PATH=$PATH:/usr/local/go/bin
 
 alias df='df -x squashfs'
-alias news='mutt -e "source ~/.config/mutt/news"'
-alias mmutt='mutt -e "source ~/.config/mutt/mcmillian"'
+alias mmutt='mutt -F ~/.config/mutt/mcmillian-muttrc'
 alias wttr='curl wttr.in'
 
 # set my titlebars
diff --git a/.config/mutt/default b/.config/mutt/default
index 381fbb2..8c18039 100644
--- a/.config/mutt/default
+++ b/.config/mutt/default
@@ -1,7 +1,8 @@
+source ~/.config/mutt/common
 set from=""
 set imap_user = ""
 set imap_pass = "`echo get muh paws`"
+set spoolfile = "imaps://$imap_user@HOSTNAME/"
 set folder = "imaps://HOSTNAME/"
 set smtp_url = "smtp://$imap_user@HOSTNAME:587"
 set smtp_pass = "$imap_pass"
-# vi: filetype=muttrc
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index f249342..d4e7b1c 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -1,6 +1,3 @@
-# default account
-source ~/.config/mutt/dreamfall
-
 # activate TLS if available on the server
 set ssl_starttls=yes
 
@@ -14,7 +11,6 @@ set timeout=10
 set header_cache=~/.hcache
 set net_inc=5
 
-set spoolfile = "=INBOX"
 set record = "=Sent"
 set postponed = "=Drafts"