diff --git a/etc/htmlopen.sh b/etc/htmlopen.sh
new file mode 100755
index 0000000..a0d6c35
--- /dev/null
+++ b/etc/htmlopen.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Helps open an HTML file from mutt in a GUI browser without weird side effects.
+
+file=$(mktemp -u --suffix=.html)
+
+echo $file
+cp "$1" "$file"
+
+setsid firefox "$file" &
diff --git a/etc/mailcap b/etc/mailcap
index c31107e..519c8a5 100644
--- a/etc/mailcap
+++ b/etc/mailcap
@@ -1,6 +1,7 @@
 text/plain; vim %s ;
-text/html; $BROWSER '%s' ;
+text/html; ~/.config/mutt/etc/htmlopen.sh %s ;
 text/html; w3m -I %{charset} -T text/html; copiousoutput;
 image/*; ~/.config/mutt/etc/muttimage.sh %s ; copiousoutput
-video/*; setsid nohup mpv --quiet %s & disown; copiousoutput
-application/pdf; pdftotext '%s' -; copiousoutput;
+video/*; setsid mpv --quiet %s &; copiousoutput
+application/pdf; cp '%s' /tmp/doc.pdf && setsid zathura /tmp/doc.pdf &; copiousoutput;
+application/pgp-encrypted; gpg -d '%s'; copiousoutput;