Merge branch 'master' of git.friedersdorff.com:max/dotfiles

diff --combined online_mail/.mutt/muttrc
index ea04944a1b7dd7856e28653ddf4d6f30b8fd6d39,8244d8e202fca11d19928218da77a1409b7b4216..3e6e5311e36fc5bfb55209557b08d61c8c828371
--- 1/online_mail/.mutt/muttrc
--- 2/online_mail/.mutt/muttrc
+++ b/online_mail/.mutt/muttrc
@@@ -1,6 -1,6 +1,6 @@@
  # Macro keys for different mailboxes
- macro index \e1 '<sync-mailbox><change-folder>imaps://mail.friedersdorff.com<enter>'
- macro index \e2 '<sync-mailbox><change-folder>imaps://outlook.office365.com<enter>'
+ macro index \e1 '<sync-mailbox><change-folder>imaps://mail.friedersdorff.com<enter><sidebar-open>'
+ macro index \e2 '<sync-mailbox><change-folder>imaps://outlook.office365.com<enter><sidebar-open>'
  
  
  # Configuration files for different mailboxes
@@@ -31,7 -31,7 +31,8 @@@ macro pager \cb   "|urlview\n
  
  set text_flowed=yes
  set reflow_text=yes
 -set editor="vim -v +':set textwidth=72' +'set fo=aw'"
++
 +set editor="vim +':set textwidth=72' +'set fo=aw'"
  
  # Encryption
  source ~/.mutt/gpg.rc
@@@ -49,3 -49,20 +50,20 @@@ set fast_reply=ye
  
  # Show message some message headers when reading mail
  set pager_index_lines=10
+ 
+ # Remove all headers by default
+ ignore *
+ unignore from date subject to cc
+ 
+ # Use sidebar
+ set mail_check_stats
+ set sidebar_visible=yes
+ set sidebar_width=25
+ set sidebar_folder_indent=yes
+ set sidebar_short_path=yes
+ set sidebar_divider_char='│'
+ set sidebar_format='%B%* %N'
+ 
+ bind index,pager \CP sidebar-prev
+ bind index,pager \CN sidebar-next
+ bind index,pager \CO sidebar-open