refactor MailSender