Fix email variables (close #569)
Merge pull request #570 from ChrisBr/email_variables

Fix email variables (close #569)