few refactoring due to conflict with class standard class Mail on testing