email

Changes to Email handler

post/email