diff --git a/fleacollar.sh b/fleacollar.sh
index 84335a8..1f638fe 100755
--- a/fleacollar.sh
+++ b/fleacollar.sh
@@ -180,9 +180,12 @@ EOF
             "elinks")
                 echo "text/html; $browserPath %s; nametemplate=%s.html; needsterminal" > "$muttHome/mailcap"
             ;;
-            "lynx|w3m")
+            "lynx")
                 echo "text/html; $browserPath -I %{charset} -T text/html %s; nametemplate=%s.html; copiousoutput" > "$muttHome/mailcap"
             ;;
+            "w3m")
+                echo "text/html; $browserPath -dump -s -o display_link=yes -o display_link_number=yes -o decode_url=yes -I %{charset} -T text/html %s; nametemplate=%s.html; copiousoutput" > "$muttHome/mailcap"
+            ;;
             *)
                 echo "text/html; $browserPath %s; nametemplate=%s.html; needsterminal" > "$muttHome/mailcap"
         esac