Fix hang until timeout in mailer tesits
Fix issues with locales in Mailer