diff --git a/bin/view-email-html b/bin/view-email-html
index 403ed74..00e0330 100755
--- a/bin/view-email-html
+++ b/bin/view-email-html
@@ -3,7 +3,7 @@
 
 emlfile="/tmp/neomutt-email-$$.eml"
 tmpdir="/tmp/neomutt-email-$$"
-tmpfile="$tmpdir/email.html"
+tmpfile="$tmpdir/email-$$.html"
 
 # Save email from stdin
 mkdir -p "$tmpdir"
@@ -115,7 +115,7 @@ else
                     gsub(/</, "\\&lt;", value)
                     gsub(/>/, "\\&gt;", value)
                     # Only split To, CC, Bcc addresses (not Date, Subject, From)
-                    if (tolower(header) ~ /^(to|cc|bcc)$/) {
+                    if (tolower(header) ~ /^(from|to|cc|bcc)$/) {
                         n = split_addresses(value, addrs)
                         printf "<p><strong>" header ":</strong> <span class=\"addr-list\">"
                         if (n > 1) {