This is an abuse of the version control system. Sorry.
email_html - to be deprecated soon..