BB: Make refactoring for MailSender