Improve mailbox management for navigation