Refactoring mailbox events to encapsulate properly.