Refactored MailForest storate into actual trees and a separate set of indices