Fixed some issues loading mailboxes initially