[bug 870455] Last of the HTML emails

This covers the password reset email and the already activated emails.

r?