More work on bug #8389.  It will now show the html inline or as a download.