Rebased email template

A rebase of 179 on master, just to see if the tests pass in Travis.