diff --git a/enzevalos_iphone/persistentData/FolderRecord.swift b/enzevalos_iphone/persistentData/FolderRecord.swift
index c2c54ffadaff223469441ef56eef16be82fe8e68..f89e98a32791cee6929d35a7e9a3a7fe45a4d8f5 100644
--- a/enzevalos_iphone/persistentData/FolderRecord.swift
+++ b/enzevalos_iphone/persistentData/FolderRecord.swift
@@ -13,7 +13,7 @@ import CoreData
 extension FolderRecord {
     static var FetchRequest: NSFetchRequest<FolderRecord> {
         let request: NSFetchRequest<FolderRecord> = NSFetchRequest<FolderRecord>(entityName: FolderRecord.entityName)
-        request.sortDescriptors = [NSSortDescriptor(key: "path", ascending: true)]
+        request.sortDescriptors = [NSSortDescriptor(key: "flags", ascending: false), NSSortDescriptor(key: "path", ascending: true)]
         return request
     }
 }
@@ -37,7 +37,14 @@ extension FolderRecord {
         if let minUID = properties.minUID {
             self.minUID = minUID
         }
-        self.flags = properties.flags
+        if properties.flags != 0 {
+            self.flags = properties.flags
+        }
+        if UserManager.backendInboxFolderPath == properties.path {
+            var flag = MCOIMAPFolderFlag(rawValue: Int(self.flags))
+            flag.formUnion(.inbox)
+            self.flags = Int16(flag.rawValue)
+        }
         path = properties.path
     }
     
@@ -56,10 +63,6 @@ extension FolderRecord {
     
     var type: FolderType {
         let flags = MCOIMAPFolderFlag(rawValue: Int(self.flags))
-        print(flags.isEmpty)
-        print(self.flags)
-        // TODO: IS EMPTY! WHY? Do we add this information?
-        print(flags)
         if flags.contains(MCOIMAPFolderFlag.drafts) {
             return .Draft
         }
@@ -100,7 +103,6 @@ extension FolderRecord: DisplayFolder {
     }
     
     var icon: Image {
-        print(self.path)
         var label = "folder"
         switch type {
         case .Archive: