12 files changed, 38 insertions, 5 deletions
diff --git a/dot_mutt/accounts/queensu.ca/private_main.rc.tmpl b/dot_mutt/accounts/queensu.ca/main.rc
index f7cd3e4..f7cd3e4 100644
--- a/dot_mutt/accounts/queensu.ca/private_main.rc.tmpl
+++ b/dot_mutt/accounts/queensu.ca/main.rc
diff --git a/dot_mutt/accounts/rak.rak.ac/encrypted_savehooks.rc.asc b/dot_mutt/accounts/rak.rak.ac/encrypted_savehooks.rc.asc
new file mode 100644
index 0000000..d4c6b52
--- /dev/null
+++ b/dot_mutt/accounts/rak.rak.ac/encrypted_savehooks.rc.asc
@@ -0,0 +1,35 @@
+-----BEGIN PGP MESSAGE-----
+
+hQUMAyDgI1sPXpxkASf/TywYMR2rlQHJODN7hGsX64rzuoEnaEtDVlkxzeayV2Nd
+7G6agoQyOXImenrY6jbnxIYhsfooR7Hfkc4hi5fqvFqyTdzhiiikE5IZzgtIeVJA
+Mx76xIcBBYBOQH8SgseQqVOU1fIC7JEHgwXmFFMJZM/wHzco14PuZ292gmeU/1ER
++q3YKXrqbWEAHzfDZn/Ba7gfAg7vnKqLPq9FO0akMyvkAMRq6eqrOJFwBTriDbhM
+wLdZ6ENYDPHTY3sRL/yPNPlteNpN7dt8sPHafCetYLRUUXvtvWRCP15PMoIZoT6g
+ZhxDD+WsM0HZtSr274LPR4M1w/fc9bTYqbQy+2Tey29ESZ91Yiq+eFhS/2WLN3vn
+UmnSkXKbhr679a1AJx57xLoXY4NexzJTCtiJ3omwpmuJc2Wrf2R57PYkFJuKPZO7
+Z3ThO+dY5l+PKeEO3s/zHKbhCg5LCu8ueavqFYVupdA5WBXR/dgtV8HUkduuPGzk
+ir293751Mh9KWpltarkh9YYy4HmTLBDs+GWt9QqGuY91vVfD1oj4wOi1bHCEGEY3
+dvNZGJEvU8JKadSfbL0N80mNqTfcWxjHOV0GKWvYKWo4fVkMN0wPEiZ45h2xRPmH
+RSZxKuBOubIyQwlJMx3QWWBbMJJcKll/uijWAETIZOXozEzYRPtH0tZZdj3WKyxW
+OndRrTW6t/qmzWmkZ2k3YVGkDK1KhwDzjl3rHppj9H1pSkXJCghETuIA+e4s/NVA
+h5kq/fibYMebCXV4jFQCQMAcIA/N4qJKINxM88lFfcjeTQjQ2BOddyWS5CUH7Xfe
+b0w8mc0vEiVByXdkXX30WLuKp1Ug7vV/60jLOC02DietH36CUwncZ29iYMLlhwsM
+8i/U/3tQ9eZari6ipcixnb7lpmCbRkrS5b49lpTHIFg8NBrbvrvS4ipbwy/e8I1z
+4wsmQmzYe9Qb7GPKJW41RY6nVPV24zhEnumskncaf0jPK1F+ScsapR7+3IdW5GLd
+hUbz6uDaYHdjH0mgG8eEn3pYg2Ec0tgB0tCKCFKjyuVOM/xyGPXI71lJLc3aYfUG
+TFCyFJ/UvxOKVmFdcME8ZVpkfykOdbZHPJSAb46pZNgIwipRWdBoCCt1J+Ij+PDx
+Aqg97b/R1pxGcCY4VzqYJk/+tbhIqJy2fOCAx+0FooO5kmyyv8KMgyfYv3sjGYdn
+68ZS/6AKCGTq1pnCLxSk6kwMSkJNkAUV4qr+aLiOzxSo1dBWXUWMOatPVJX3TWCi
+NGumIdgtV4dI8oTlPve7tdm0DmC86TVe2uCqd7UFleqjAktfIlu/isDRUsbLUFU2
+ZpsOEIeiuAyZqSsjPGJMjob6IBpc0ENOpenttlmnK4yjfHqmjzW3sLEVh8q8LE7v
+3I+JAJJI1YhUvd8BZWnyavwpHxx2p4678QNTOxxy0Jo5lqSHsM1l7/fai2DiTA6Y
+sdGuznmtP5bBGsbAdpcg9/6/RfGI1i52qGBU+1WRLn9Iph68elPEyEdpDayxdSAQ
+QmFymEScoe5wqk+FDPqutdPiofQYZdwGbaRlsT2+f+YGlTi/zNcpxFIngXJ3PX93
+o2AZX5+1llNn4VPbeMwW+diMBYmmZFW4tMRJGyVCDVsviz2wD/7VNOSvWZ2r5zcA
+MvZSXKh/JF8tZ3Qxft7guD2nVFGB1B4vTuZ51wZH9gAYZhsHqUlIIlOqfTbh2lTS
+ugEVpqnNv7HO8i4mqj6nXpGTeLWrcnFxRh+Tw6LQevuJftg0yLgmZMpZuT1+Vs59
+zxnyska+Wd0Gr4C1jm8LNBLA9dmr2cS/MDjcMPAyzmIKP+k5H7vkkpaEk6TRj+Ic
+wequHwJWa0pDh9EWuE1Aob0vE8x3gTJciPXtkIyN+EKDfwQ2KSiM7TWcXxvWVu/v
+cM/CSZhSwfIe/14vEnKKaq4lzqXoT/zXcaxfAL3CXu1TyFZWj4OuaZ3r8g==
+=zt8/
+-----END PGP MESSAGE-----
diff --git a/dot_mutt/accounts/rak.rak.ac/private_main.rc.tmpl b/dot_mutt/accounts/rak.rak.ac/main.rc
index 9376bc8..2c1b109 100644
--- a/dot_mutt/accounts/rak.rak.ac/private_main.rc.tmpl
+++ b/dot_mutt/accounts/rak.rak.ac/main.rc
@@ -8,5 +8,6 @@ source folders.rc
 source read.rc
 source send.rc
 source format.rc
+source savehooks.rc
 
 cd
diff --git a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/encrypted_private_alias.rc b/dot_mutt/accounts/rkavanag.alumni.cmu.edu/encrypted_private_alias.rc.asc
index c16c4f7..c16c4f7 100644
--- a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/encrypted_private_alias.rc
+++ b/dot_mutt/accounts/rkavanag.alumni.cmu.edu/encrypted_private_alias.rc.asc
diff --git a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/private_main.rc.tmpl b/dot_mutt/accounts/rkavanag.alumni.cmu.edu/main.rc
index 2360d6c..2360d6c 100644
--- a/dot_mutt/accounts/rkavanag.alumni.cmu.edu/private_main.rc.tmpl
+++ b/dot_mutt/accounts/rkavanag.alumni.cmu.edu/main.rc
diff --git a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/private_main.rc.tmpl b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/main.rc
index 053a327..053a327 100644
--- a/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/private_main.rc.tmpl
+++ b/dot_mutt/accounts/ryan.kavanagh.mail.mcgill.ca/main.rc
diff --git a/dot_mutt/accounts/ryan.kavanagh.mcgill.ca/private_main.rc.tmpl b/dot_mutt/accounts/ryan.kavanagh.mcgill.ca/main.rc
index cc70e66..cc70e66 100644
--- a/dot_mutt/accounts/ryan.kavanagh.mcgill.ca/private_main.rc.tmpl
+++ b/dot_mutt/accounts/ryan.kavanagh.mcgill.ca/main.rc
diff --git a/dot_mutt/accounts/ryanakca.gmail.com/private_main.rc.tmpl b/dot_mutt/accounts/ryanakca.gmail.com/main.rc
index 7876e09..7876e09 100644
--- a/dot_mutt/accounts/ryanakca.gmail.com/private_main.rc.tmpl
+++ b/dot_mutt/accounts/ryanakca.gmail.com/main.rc
diff --git a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/encrypted_alias-mcgill.rc.asc b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/encrypted_alias.rc.asc
index 21fc93b..21fc93b 100644
--- a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/encrypted_alias-mcgill.rc.asc
+++ b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/encrypted_alias.rc.asc
diff --git a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/private_main.rc.tmpl b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/main.rc
index e5619eb..e5619eb 100644
--- a/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/private_main.rc.tmpl
+++ b/dot_mutt/accounts/ryank.mail.cs.mcgill.ca/main.rc
diff --git a/dot_mutt/encrypted_private_alias.rc.asc b/dot_mutt/encrypted_private_alias.rc.asc
index 69974f7..4e71be9 100644
--- a/dot_mutt/encrypted_private_alias.rc.asc
+++ b/dot_mutt/encrypted_private_alias.rc.asc
diff --git a/dot_muttrc.tmpl b/dot_muttrc.tmpl
index 5000ac5..0552516 100644
--- a/dot_muttrc.tmpl
+++ b/dot_muttrc.tmpl
@@ -126,12 +126,9 @@ set fcc_before_send=yes
 # For the -f option to work properly with account-hooks, it looks like I need
 # to unset the folder option
 unset folder
-source ~/.mutt/accounts.rc
-# load alias-cmu.rc before alias.rc so that alias.rc overrides any aliases
-# in all accounts apart from SCS. The SCS account hook reloads alias-cmu.rc
-# afterwards
-source ~/.mutt/alias-cmu.rc
+# alias.rc before accounts.rc
 source ~/.mutt/alias.rc
+source ~/.mutt/accounts.rc
 source ~/.mutt/mailinglists.rc
 source ~/.mutt/score.rc
 source ~/.mutt/color.rc