fix issue with email interpolation in templates
Merge pull request #534 from mozilla/template_email_fix

fix issue with email interpolation in templates