diff --git a/mail/.config/mutt/mailboxes b/mail/.config/mutt/mailboxes
index eb47eea..673f334 100644
--- a/mail/.config/mutt/mailboxes
+++ b/mail/.config/mutt/mailboxes
@@ -1,12 +1,3 @@
-mailboxes = +rawlinson/INBOX \
-            +rawlinson/Archive \
-            +rawlinson/Drafts \
-            +rawlinson/Sent \
-            +rawlinson/Junk \
-            +rawlinson/Trash \
-            +nullpointer/INBOX \
-            +nullpointer/Archive \
-            +nullpointer/Drafts \
-            +nullpointer/Junk \
-            +nullpointer/Sent \
-            +nullpointer/Trash
+source 'find ~/.mail -name cur -printf "mailboxes \"%h\"\n"|sort|'
+
+# vim: syntax=muttrc
diff --git a/mail/.config/mutt/muttrc b/mail/.config/mutt/muttrc
index e46bbb9..7596735 100644
--- a/mail/.config/mutt/muttrc
+++ b/mail/.config/mutt/muttrc
@@ -41,3 +41,4 @@ source ~/.config/mutt/hooks
 source ~/.config/mutt/notmuch
 
 #set read_only # set read-only when messing around with settings
+# vim: syntax=muttrc