minor improvements in MailServiceImpl