EMailSender refactoring;