# 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 \e3 '<sync-mailbox><change-folder>imaps://maxf130@imap.gmail.com<enter>'
-macro index \e4 '<sync-mailbox><change-folder>imaps://max@musoft.co.uk@imap.gmail.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
folder-hook 'friedersdorff.com' 'source ~/.mutt/account.com.friedersdorff.max'
-folder-hook 'office365.com' 'source ~/.mutt/account.uk.ac.le.student.mf195'
-folder-hook 'maxf130@imap.gmail.com' 'source ~/.mutt/account.com.gmail.maxf130'
-folder-hook 'max@musoft.co.uk@imap.gmail.com' 'source ~/.mutt/account.uk.co.musoft.max'
+folder-hook 'outlook.office365.com' 'source ~/.mutt/account.uk.ac.aber.maf54'
macro index 'c' '<change-folder>?<change-dir><home>^K+<enter>'
# Source the passwords file
-source "gpg -dq ~/.mutt/passwords.gpg |"
+#source "gpg2 -dq ~/.mutt/passwords.gpg |"
+set my_personal_password=`pass Home/xenon/mail/max@friedersdorff.com | head -n 1`
+set my_aber_password=`pass Aber/Main | head -n 1`
# Always check personal email first
source ~/.mutt/account.com.friedersdorff.max
auto_view text/html
alternative_order text/plain text/enriched text/html
-# Solarized color theme
-source ~/.mutt/solarized.muttrc
-
# use abook for aliases
set alias_file=~/.mutt/aliases
set sort_alias= alias
macro pager \cb "|urlview\n"
set text_flowed=yes
-set editor="vim +':set textwidth=72' +'set fo=aw'"
+set reflow_text=yes
+set editor="vim -v +':set textwidth=72' +'set fo=aw'"
# Encryption
source ~/.mutt/gpg.rc
+
+# Speed up folder switch
+set sleep_time=0
+
+# Mutt colors
+source ~/.mutt/colors.mutt
+
+set sort=threads
+set sort_aux=last-date-received
+
+set fast_reply=yes
+
+# 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