diff --git a/.config/mutt/mailcap b/.config/mutt/mailcap
index e3dcdc9..3801a57 100644
--- a/.config/mutt/mailcap
+++ b/.config/mutt/mailcap
@@ -1,4 +1,4 @@
-text/html; lynx -force_html -dump %s; copiousoutput
+text/html; w3m -T text/html -o imgdisplay="" -dump %s; copiousoutput
 application/pdf; evince %s
 application/vnd.openxmlformats-officedocument.wordprocessingml.document; pandoc --from docx --to markdown %s; copiousoutput
 application/vnd.oasis.opendocument.text; pandoc --from odt --to markdown %s; copiousoutput
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index 9a312da..53279af 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -31,7 +31,7 @@ bind pager,index \ck sidebar-prev
 bind pager,index \co sidebar-open
 bind pager,index c mail
 
-bind pager,index g noop # unbind g to be used with macros, e.g. gg
+bind pager,index,attach g noop # unbind g to be used with macros, e.g. gg
 bind pager,index m noop # unbind M to be used with macros, e.g. mv
 
 macro index gg "<first-entry>"
@@ -42,8 +42,10 @@ macro pager gn "<next-entry>"
 macro pager gp "<previous-entry>"
 macro pager gr "<group-reply>"
 # Allow urlscan to follow links additional of the builtin urlview
-macro pager \cg '<pipe-message>urlscan -W<enter>' "Follow links with urlscan"
-macro pager \cv '<pipe-message>urlscan<enter>' "Follow links with urlscan"
+macro index,pager,attach gu '<pipe-message>urlscan -W<enter>' "Follow links with urlscan"
+macro index,pager,attach go '<pipe-message>urlscan<enter>' "Follow links with urlscan"
+# Neither builtin urlview nor urlscan really worked great on stupid marketing mails, so w3m for the rescue...
+macro index,pager,attach gv "<view-attachments><search>text/html<enter><pipe-message>w3m -T text/html -o imgdisplay= -o confirm_qq=false<enter><exit>"
 
 macro index,pager mv "<tag-prefix><save-message>" "move message to chosen folder"