diff --git a/.muttrc b/.muttrc
index 0289810..75d9930 100644
--- a/.muttrc
+++ b/.muttrc
@@ -1,44 +1,36 @@
-# Accound information
-source '~/.muttrc.sh|'
+# Account information
+set from="hunter@puppet.com"
+set imap_user="hunter@puppet.com"
+source '~/.muttpassword.sh|'
+set realname="Hunter Haugen"
+set folder="imaps://imap.gmail.com:993"
+set spoolfile="+INBOX"
+set postponed="+[Gmail]/Drafts"
+
 
 # Cache message headers for quick retrieval
 set header_cache=~/.mutt/cache/headers
 set message_cachedir=~/.mutt/cache/bodies
 set certificate_file=~/.mutt/certificates
 
-set move=no
+# ?
 set imap_keepalive=900
 
-# Sort like gmail sorts it, almost
+# Sort like gmail sorts it: freshest-thread first
 set sort=threads
-set sort_aux=last-date-received
+set sort_aux=reverse-last-date-received
 # Automatically poll subscribed mailboxes for new mail
-set imap_check_subscribed
+set imap_check_subscribed=yes
 # Display download progress every 5K
 set net_inc=5
 # Don't skip past end of message on <space>
 set pager_stop=yes
 
-# uber-mutt stuff
-set sidebar_width=22
-set sidebar_visible=no
-set sidebar_delim='|'
-#set sidebar_sort=yes
-color sidebar_new color148 default
-bind index \CP sidebar-prev
-bind index \CN sidebar-next
-bind index \CO sidebar-open
-bind pager \CP sidebar-prev
-bind pager \CN sidebar-next
-bind pager \CO sidebar-open
-macro index b '<enter-command>toggle sidebar_visible<enter><refresh>'
-macro pager b '<enter-command>toggle sidebar_visible<enter><redraw-screen>'
-bind index B bounce-message
-
-# Ignore gmail stuff, just in case
-ignore "Authentication-Results:"
-ignore "DomainKey-Signature:"
-ignore "DKIM-Signature:"
+# Don't copy sent mail; gmail does it
+unset record
+set copy=no
+# Don't move mail out of inbox on delete; gmail does it
+set move=no
 
 # Pretty it up
 # ----
@@ -80,13 +72,13 @@ bind pager K previous-thread
 bind pager R group-reply
 
 # Macros
-macro index,pager c   "<change-folder>?<toggle-mailboxes>" "open a different folder"
-macro index ,cu "T.*\n;WN;WO^T.*\n"                  "catch up"
-macro generic,pager ,sm ":source $HOME/.muttrc\r"          "Resource .muttrc without restart"
+macro index,pager   c   "<change-folder>?<toggle-mailboxes>" "open a different folder"
+macro index         ,cu "T.*\n;WN;WO^T.*\n"                  "catch up"
+macro generic,pager ,sm ":source $HOME/.muttrc\r"            "Resource .muttrc without restart"
 # Gmail macros
-macro index,pager y "<enter-command>unset trash\n<delete-message>" "Archive message"
-macro index,pager gi "<change-folder>=INBOX<enter>" "Go to inbox"
-macro index,pager ga "<change-folder>=[Gmail]/All Mail<enter>" "Go to all mail"
-macro index,pager gs "<change-folder>=[Gmail]/Sent Mail<enter>" "Go to sent mail"
-macro index,pager gd "<change-folder>=[Gmail]/Drafts<enter>" "Go to drafts"
+macro index,pager y  "<enter-command>unset trash\n<delete-message>" "Archive message"
+macro index,pager gi "<change-folder>=INBOX<enter>"                 "Go to inbox"
+macro index,pager ga "<change-folder>=[Gmail]/All Mail<enter>"      "Go to all mail"
+macro index,pager gs "<change-folder>=[Gmail]/Sent Mail<enter>"     "Go to sent mail"
+macro index,pager gd "<change-folder>=[Gmail]/Drafts<enter>"        "Go to drafts"
 
diff --git a/.muttrc.sh b/.muttrc.sh
deleted file mode 100755
index b44f5f6..0000000
--- a/.muttrc.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-if [ x"$HOST" = "xcz.puppetlabs.lan" ] ; then
-    echo 'set imap_user="hunter@puppetlabs.com"'
-    echo 'set from="hunter@puppetlabs.com"'
-    echo 'set realname="Hunter Haugen"'
-    #set imap_pass="password"
-
-    #set smtp_url="smtp://hunter.haugen@smtp.gmail.com:587/"
-
-    echo 'set folder="imaps://imap.gmail.com:993"'
-    echo 'set spoolfile="+INBOX"'
-    set postponed="+[Gmail]/Drafts"
-    set record="+[Gmail]/Sent Mail"
-else
-    # IMAP
-    echo 'set imap_user="hunner"'
-    #set imap_pass="password"
-
-    # SMTP
-    echo 'set smtp_url="smtp://mailhost.cecs.pdx.edu:587/"'
-    #set ssl_min_dh_prime_bits=512
-    #set smtp_pass="password"
-    echo 'set from="hunner@cat.pdx.edu"'
-    echo 'set realname="Hunter Haugen"'
-
-    # Folders
-    echo 'set folder="imaps://mailhost.cecs.pdx.edu:993"'
-    echo 'set spoolfile="+INBOX"'
-fi