Better handle mailboxes disappearing