Revert broken empty mailbox detection