diff --git a/mutt/.muttrc b/mutt/.muttrc
index 75126ee..5a66069 100644
--- a/mutt/.muttrc
+++ b/mutt/.muttrc
@@ -22,4 +22,13 @@ unset mime_forward                   # forward attachments as part of body
 unmy_hdr *       # delete existing header-settings, if there are any.
 my_hdr X-PGP-Key: https://keybase.io/nikdoof/pgp_keys.asc
 
+set record = "+.Sent"
+set postponed = "+.Drafts"
+
+mailboxes `echo -n "+ "; find ~/Maildir -maxdepth 1 -type d -name ".*" -printf "+%f' "`
+macro index c "<change-folder>?<toggle-mailboxes>" "open a different folder"
+macro pager c "<change-folder>?<toggle-mailboxes>" "open a different folder"
+macro index C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
+macro index M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
+
 unignore List-ID # Show list ID for mailing lists