diff --git a/mutt/mailcap b/mutt/mailcap
index 9abf866..00b54eb 100644
--- a/mutt/mailcap
+++ b/mutt/mailcap
@@ -1,4 +1,4 @@
-text/html; w3m -I %{charset} -T text/html; copiousoutput;
+text/html; w3m -v -F -I %{charset} -T text/html -cols 120 -dump %s; edit=vim; compose=vim; nametemplate=%s.html; needsterminal; copiousoutput
 image/jpeg; ~/.mutt/view_attachment.sh %s jpg
 image/jpg; ~/.mutt/view_attachment.sh %s jpg
 image/pjepg; ~/.mutt/view_attachment.sh %s jpg
diff --git a/muttrc b/muttrc
index 1d08e34..b6245f8 100644
--- a/muttrc
+++ b/muttrc
@@ -89,8 +89,8 @@ macro pager \Cu "|urlview<enter>" "call urlview to open links"
 color index default     default     ~A
 # Unread email
 color index color33     default     ~U
-# Email to me
-#color index color64     default     ~p
+# Email to me. Not flagged or tagged. (Those have their own colors.)
+color index color64     default     "~p!~T!~F"
 # Collapsed thread
 color index color61     default     ~v
 # Deleted email