# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1414533318 14400
# Node ID 141b96496989091fce4aa5165946f94d31c2374f
# Parent  e8ba45f413665278c11f2de3a1d67a1da3832d34# Parent  fd448e6793d1afc338fd198f764d287c2ecccc7c
Merge.

diff -r e8ba45f41366 -r 141b96496989 mutt/muttrc
--- a/mutt/muttrc	Fri Oct 17 11:30:34 2014 -0400
+++ b/mutt/muttrc	Tue Oct 28 17:55:18 2014 -0400
@@ -45,14 +45,14 @@
 # }}}
 # Sidebar Patch {{{
 
-set sidebar_delim   = '  │'
-set sidebar_visible = yes
-set sidebar_width   = 26
-color sidebar_new color221 color233
-bind index,pager <down>   sidebar-next
-bind index,pager <up>     sidebar-prev
-bind index,pager <right>  sidebar-open
-set sidebar_format = "%B %> %S"
+# set sidebar_delim   = '  │'
+# set sidebar_visible = yes
+# set sidebar_width   = 26
+# color sidebar_new color221 color233
+# bind index,pager <down>   sidebar-next
+# bind index,pager <up>     sidebar-prev
+# bind index,pager <right>  sidebar-open
+# set sidebar_format = "%B %> %S"
 
 # }}}
 # Status Bar {{{
@@ -70,6 +70,7 @@
 set uncollapse_jump                        # don't collapse on an unread message
 set sort_re                                # thread based on regex
 set reply_regexp = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*"
+set folder_format = "%2C %t %N %8s %f"
 
 # }}}
 # Pager View Options {{{
@@ -176,8 +177,9 @@
 macro index M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
 
 # Quickly change mailboxes
-macro index \' "<change-folder>+simple/INBOX<enter>"   "go to INBOX"
-macro index \" "<change-folder>+simple/archive<enter>" "go to archive"
+macro index c "<change-folder>?<toggle-mailboxes>"     "change folder"
+macro index \' "<change-folder>+INBOX<enter>"   "go to INBOX"
+macro index \" "<change-folder>+archive<enter>" "go to archive"
 
 # Search with notmuch
 macro index S "<enter-command>unset wait_key<enter><shell-escape>mutt-notmuch-py -G ~/.mail/search<enter><change-folder-readonly>+search<enter>" "search mail (using notmuch)"