MailService refactoring, ootb support for SMTP