refactoring MailService #11