Completed new email

Closes https://trello.com/c/TjidCklb/110-new-email-coding