Working on the email code