5 files changed, 8 insertions, 21 deletions
diff --git a/.gitignore b/.gitignore
index 1f2d669..ed19a88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ SUBSTS.local
 SUBSTS.merged
 .mutt/alias.rc
 .mutt/alias-cmu.rc
+.mutt/savehooks.rc
 .ssh/id_rsa
 .ssh/id_ecdsa
 .ssh/id_rsa.lambda
diff --git a/.mutt/savehooks.rc b/.mutt/savehooks.rc
deleted file mode 100644
index cb181f5..0000000
--- a/.mutt/savehooks.rc
+++ /dev/null
@@ -1,16 +0,0 @@
-# Bagpipes
-save-hook info@brownbagpipesupply\\.com =Bagpipes
-
-# Newsletters
-save-hook vfr-no-reply@aynrand\\.org =VfR
-
-# SAIL
-save-hook (ahmed|bram|mei)@cs\\.queensu\\.ca =Queens.SAIL
-
-# Catch-all
-save-hook .*@.*queensu\\.ca =Queens
-
-save-hook =fnoreply@musicbrainz.org =MusicBrainz
-
-# Debian
-#save-hook =hX-Debian-PR-Source:\ prerex =Debian.prerex
diff --git a/.muttrc b/.muttrc
index 2661f3b..deb4f4b 100644
--- a/.muttrc
+++ b/.muttrc
@@ -118,20 +118,20 @@ unignore X-Label:
 
 set mbox_type=mbox
 
+# folder needs to be set before anything that depends on it
+set folder='imaps://ryanakca@gmail.com@imap.gmail.com/'
+set spoolfile='=INBOX'
+source ~/.mutt/accounts.rc
 source ~/.mutt/alias-cmu.rc
 source ~/.mutt/alias.rc
 source ~/.mutt/mailinglists.rc
 source ~/.mutt/score.rc
 source ~/.mutt/color.rc
-source ~/.mutt/accounts.rc
 source ~/.mutt/savehooks.rc
 source ~/.mutt/gpg.rc
 source ~/.mutt/ssl.rc
 source ~/.mutt/news.rc
 
-set folder='imap://localhost'
-set spoolfile='=INBOX'
- 
 #set folder="/home/ryan/.maildb/GMAIL/"
 #set spoolfile='/home/ryan/.maildb/GMAIL/INBOX'
 #mailboxes ! + `sed -e 's/\(.*\)$/"+.\1"/g' .maildb/GMAIL/subscriptions | tr '\n' ' '`
diff --git a/Makefile b/Makefile
index 622ee1c..ebf4120 100755
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,8 @@ LOCAL_FILES = \
 # GPG encrypted files
 GPG_FILES = \
     .mutt/alias.rc \
-    .mutt/alias-cmu.rc
+    .mutt/alias-cmu.rc \
+    .mutt/savehooks.rc
 
 # Files that are system independent.
 # IMPORTANT: directories must have trailing slash
@@ -144,6 +145,7 @@ FORCE:
 
 .mutt/alias.rc: gpg/.mutt/alias.rc.gpg
 .mutt/alias-cmu.rc: gpg/.mutt/alias-cmu.rc.gpg
+.mutt/savehooks.rc: gpg/.mutt/savehooks.rc.gpg
 .ssh/id_%: gpg/.ssh/id_%.gpg
 # $(patsubst gpg/,,$(wildcard gpg/.* gpg/*))
 $(GPG_FILES):
diff --git a/gpg/.mutt/savehooks.rc.gpg b/gpg/.mutt/savehooks.rc.gpg
new file mode 100644
index 0000000..627e3f9
--- /dev/null
+++ b/gpg/.mutt/savehooks.rc.gpg