improve mailbox-not-found logic