working on email
Merge pull request #41 from edatrix/email-content

working on email