#111 Refactor Emails