business mail sender update, tests and refactoring