[DF-1446] fix review issues in mail sender