Refactoring into mailboxes and mailsender - less colaborators for mail service