Change MessageController to MessageMailbox