stuff
Merge pull request #42 from edatrix/email-content

stuff