diff --git a/mailboxes/detach.cgi b/mailboxes/detach.cgi
index ea419b7c8..09aa5ab90 100755
--- a/mailboxes/detach.cgi
+++ b/mailboxes/detach.cgi
@@ -100,7 +100,8 @@ else {
                         print "Content-type: $attach->{'type'}\n\n";
                         }
 		}
-	if ($attach->{'type'} =~ /^text\/html/i && !$in{'save'}) {
+	if ($attach->{'type'} =~ /^(text\/html|image\/svg|application\/xhtml)/i
+	    && !$in{'save'}) {
 		print &safe_urls(&filter_javascript($attach->{'data'}));
 		}
 	else {