diff --git a/.mailcap b/.mailcap
new file mode 100644
index 0000000..3ba639f
--- /dev/null
+++ b/.mailcap
@@ -0,0 +1,3 @@
+text/html; w3m -I %{charset} -T text/html -cols 150; copiousoutput;
+#text/html; pandoc -f html -t markdown; copiousoutput;
+
diff --git a/.muttrc b/.muttrc
index 799a5cc..f449640 100644
--- a/.muttrc
+++ b/.muttrc
@@ -1,15 +1,17 @@
-set imap_user = "barak@barakmich.com"
+set imap_user = "bmichener@lyft.com"
 #set imap_pass = "secret"
+source ~/.mutt/secret
 
-set smtp_url = "smtp://barak@barakmich.com@smtp.gmail.com:587/"
+set smtp_url = "smtp://bmichener@lyft.com@smtp.gmail.com:587/"
 #set smtp_pass = "secret"
-set from = "me@barakmich.com"
+set from = "barakmich@lyft.com"
 set realname = "Barak Michener"
 
 set folder = "imaps://imap.gmail.com:993"
 set spoolfile = "+INBOX"
 set postponed = "+[Gmail]/Drafts"
 set record="+[Gmail]/Sent Mail"
+set copy=no
 set trash = "imaps://imap.gmail.com/[Gmail]/Trash"
 
 # These two lines appear to be needed on some Linux distros, like Arch Linux
@@ -34,6 +36,7 @@ bind  index,pager s  flag-message			#Star a message
 macro index,pager +  "<save-message>=[Gmail]/Important<enter>" "Mark as important"
 macro index,pager !  "<save-message>=[Gmail]/Spam<enter>" "Report spam"
 bind  index,pager a  group-reply			#Reply all
+bind  pager       A  view-attachments			#In emails
 bind  index,pager \# delete-thread			#Delete
 bind  index,pager l  copy-message			#Label
 bind  index	  L  limit
@@ -72,7 +75,7 @@ set beep_new
 set sort = reverse-threads
 set sort_aux = last-date-received
 
-alternative_order text/plain text/html
+alternative_order text/plain text/enriched text/html
 auto_view text/html
 
 #set alias_file = ~/.mutt/aliases
@@ -87,6 +90,8 @@ bind index gg first-entry
 bind index G last-entry
 #bind index A toggle-read
 bind index n mail
+bind index _ collapse-all
+bind index - collapse-thread
 
 macro index c "<change-folder>?<toggle-mailboxes>" "open a different folder"
 macro pager c "<change-folder>?<toggle-mailboxes>" "open a different folder"
@@ -116,3 +121,13 @@ color header	brightblue black ^Subject:
 color body	brightred black [\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+
 color body	brightblue black (https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+
 color index brightcyan default ~N
+
+color index yellow  default "~v~(!~N)~(!~F)" # collapsed thread with no New or Flagged
+color index red     default "~v~(~F)~(!~N)"  # collapsed thread with Flagged but no New
+color index green   default "~v~(~N)"        # collapsed thread with New
+
+folder-hook . exec collapse-all
+## TO show the number of messages in a collapsed thread
+## you need to add "%M" to the "index_format", eg:
+#set index_format="%4C %Z %2M %[!%y%m%d] %-17.17F (%3l) %s"
+set index_format="%4C %Z %2M %{%b %d} %-15.15L (%?l?%4l&%4c?) %s"