Minor performance tweaks to speed up mailbox loading