Fix expansion of mailboxes