Consolidated folder logic. Added mailboxes collection with names and unread count