Inbox refactor.