Feature/email handler