2 files changed, 3 insertions, 2 deletions

diff --git a/mutt/default b/mutt/default
index 6aa58e1..9c0f7e0 100644
--- a/mutt/default
+++ b/mutt/default
@@ -1,5 +1,5 @@
 # Edit rc file and source it. This is the most important thing
-macro index,browser \Cv ":set wait_key=no<Return>!$EDITOR ~/.config/mutt/muttrc<Return>:source ~/.config/mutt/muttrc<Return>:set wait_key=yes<Return>"
+macro index,browser,attach \Cv ":set wait_key=no<Return>!$EDITOR ~/.config/mutt/muttrc<Return>:source ~/.config/mutt/muttrc<Return>:set wait_key=yes<Return>"
 
 # Connection options
 set ssl_force_tls = yes
diff --git a/mutt/mailcap b/mutt/mailcap
index 2899a40..1a44cfa 100644
--- a/mutt/mailcap
+++ b/mutt/mailcap
@@ -1,5 +1,6 @@
+text/plain;                 vim '%s'
+text/html;                  firefox '%s'; test=test -n "$DISPLAY"; needsterminal;
 text/html;                  w3m -I %{charset} -T text/html; copiousoutput;
-text/plain;                 surf '%s'; test=test -n "$DISPLAY"; needsterminal;
 application/json;           jq . %s | less -N; copiousoutput;
 application/pdf;            firefox '%s'; test=test -n "$DISPLAY"; needsterminal;
 application/octet-stream;   firefox '%s'; test=test -n "$DISPLAY"; needsterminal;