New HTML email template

See #3082
Merge pull request #3219 from JohnONolan/email

New HTML email template