merge with [DF-590] MailSender