refactoring mailSender
Merge origin/master