Fix regression in handling mailbox export