 //            }
         case .Feed:
             //return filteredFeeds?.count ?? 0
-            let count = countOfFilteredFeeds
-            if count > 0 {
-                if !isMoreFeedsFold {
-                    return count + 1
-                }
-                if count > Section.maxNumberOfItems {
-                    return Section.maxNumberOfItems + 1
-                } else {
-                    return count
-                }
-            } else {
-                return 0
-            }
+            return numberOfRowsWithCountOfItems(countOfFilteredFeeds, fold: isMoreFeedsFold)
+
 //            if let count = filteredFeeds?.count where count > 0 {
 //                return count + 1
 //            } else {

            } else {
                return 0
            }
//            if let count = filteredFriends?.count where count > 0 {
//                return count + 1
//            } else {

//            }
        case .MessageRecord:
            //return countOfFilteredUserMessages
            return numberOfRowsWithCountOfItems(countOfFilteredUserMessages, fold: isMoreUserMessagesFold)

            //return filteredMessages?.count ?? 0
//            if let count = filteredMessages?.count where count > 0 {
//                return count + 1
