--- a/mutt/muttrc	Mon Dec 19 20:06:46 2016 -0800
+++ b/mutt/muttrc	Tue Dec 20 22:01:13 2016 -0800
@@ -1,45 +1,103 @@
 
-# Connection
-set folder = "imaps://$my_imap"
-set imap_user = "$my_user"
-set imap_pass = "$my_pass"
-set smtp_url = "smtps://$my_user@$my_smtp"
-set smtp_pass = "$my_pass"
+# Main stuff.
 set from = "$my_user"
 set realname = "$my_realname"
 
-set imap_check_subscribed
-set imap_idle
 
-
-# Folders
-set folder = "imaps://$my_url/$my_folder_inbox"
-set spoolfile = "imaps://$my_url/$my_folder_inbox"
-set record = "imaps://$my_url/$my_folder_sent"
-set postponed = "imaps://$my_url/$my_folder_drafts"
+# Folders... apparently Mutt doesn't pull all of them automatically.
+mailboxes = "imaps://$my_imap/$my_folder_inbox" \
+            "imaps://$my_imap/Sent Items" \
+            "imaps://$my_imap/Drafts" \
+            "imaps://$my_imap/Archive" \
+            "imaps://$my_imap/MailingLists" \
+            "imaps://$my_imap/Newsletters" \
+            "imaps://$my_imap/Trash"
 
 
 # Basic config
-set editor = "vim"
-set hostname = "$my_hostname"
+#set editor = "vim"
+set editor = "vim +/^$ ++1 -c 'set tw=76 expandtab nosmartindent spell'"
+#set hostname = "$my_hostname"
 set header_cache=~/.mutt/cache/headers
 set message_cachedir=~/.mutt/cache/bodies
 set certificate_file=~/.mutt/certificates
 set move = no
 set delete = yes
-set include
 set sort = 'threads'
 set sort_aux = 'reverse-last-date-received'
 set auto_tag = yes
+set pager_stop  # Don't move to the next message automatically
+set fast_reply  # Don't ask stupid questions when replying
+set include  # Auto-quote
+set reverse_name  # Reply from the account the message was sent to
+set use_envelope_from  # Move or less same as previous
+set quit = yes  # Don't ask before quitting
+set mark_old = no  # Read/unread is enough
+set beep_new = yes  # Been when there are new messages
+set pipe_decode  # Strip headers and eval mimes when piping
+set thorough_search  # Strip headers and eval mimes before searching
+set uncollapse_jump
+set date_format = "%d/%m/%Y"  # Show the date like you're civilized
+set index_format = "[%Z]  %D  %-20.20F  %s"
+set collapse_unread
+
 ignore "Authentication-Results:"
 ignore "DomainKey-Signature:"
 ignore "DKIM-Signature:"
 hdr_order Date From To Cc
 alternative_order text/plain text/html *
 auto_view text/html
+
 bind editor <Tab> complete-query
 bind editor ^T complete
-bind editor <space> noop 
+
+bind index <tab> sync-mailbox
+bind index <space> collapse-thread
+
+bind index gg first-entry
+bind index G last-entry
+
+bind index R group-reply
+
+
+# Pager
+set pager_index_lines = 10  # number of index lines to show
+set pager_context = 3  # number of context lines to show
+set pager_stop  # don't go to next message automatically
+set menu_scroll  # scroll in menus
+set tilde  # show tildes like in vim
+unset markers  # no ugly plus signs
+
+set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
+alternative_order text/plain text/enriched text/html
+
+bind pager k previous-line
+bind pager j next-line
+bind pager gg top
+bind pager G bottom
+
+bind pager R group-reply
+
+bind attach <return> view-mailcap # View attachements properly
+
+macro pager \Cu "|urlview<enter>" "call urlview to open links"
+
+
+# Status bar
+set status_chars  = " *%A"
+set status_format = "───[ Folder: %f ]───[%r%m messages%?n? (%n new)?%?d? (%d to delete)?%?t? (%t tagged)? ]───%>─%?p?( %p postponed )?───"
+
+
+# Sidebar
+set sidebar_visible
+set sidebar_short_path
+set sidebar_format = "%B%?F? [%F]?%* %?N?%N/?%S"
+set mail_check_stats
+
+bind index,pager B sidebar-toggle-visible
+bind index,pager <down>   sidebar-next
+bind index,pager <up>     sidebar-prev
+bind index,pager <right>  sidebar-open
 
 
 # Gmail-style keyboard shortcuts