better handling of html e-mails