small fix
[bug 869463] HTML emails for users app
fixup
Use email_utils.make_mail to preflight emails`
More preflight stuff
more fixes