diff --git a/Yep/ViewControllers/Feeds/FeedsViewController.swift b/Yep/ViewControllers/Feeds/FeedsViewController.swift
index d1cc933c..9fe9cb2d 100644
--- a/Yep/ViewControllers/Feeds/FeedsViewController.swift
+++ b/Yep/ViewControllers/Feeds/FeedsViewController.swift
@@ -189,15 +189,29 @@ class FeedsViewController: BaseViewController {
             return height
 
         } else {
-
             let height: CGFloat
+
             switch feed.kind {
+
             case .Text:
                 height = FeedBasicCell.heightOfFeed(feed)
+
+            case .Image:
+                if feed.imageAttachmentsCount == 1 {
+                    height = FeedBiggerImageCell.heightOfFeed(feed)
+
+                } else if feed.imageAttachmentsCount <= 3 {
+                    height = FeedNormalImagesCell.heightOfFeed(feed)
+
+                } else {
+                    height = FeedCell.heightOfFeed(feed)
+                }
+
             case .GithubRepo, .DribbbleShot, .Audio, .Location:
                 height = FeedSocialWorkCell.heightOfFeed(feed)
+
             default:
-                height = FeedCell.heightOfFeed(feed)
+                height = FeedBasicCell.heightOfFeed(feed)
             }
 
             if !key.isEmpty {
diff --git a/Yep/Views/Cells/Feed/FeedBiggerImageCell.swift b/Yep/Views/Cells/Feed/FeedBiggerImageCell.swift
index 090bfb2d..ee90fd3f 100644
--- a/Yep/Views/Cells/Feed/FeedBiggerImageCell.swift
+++ b/Yep/Views/Cells/Feed/FeedBiggerImageCell.swift
@@ -27,6 +27,13 @@ class FeedBiggerImageCell: FeedBasicCell {
         return imageView
     }()
 
+    override class func heightOfFeed(feed: DiscoveredFeed) -> CGFloat {
+
+        let height = super.heightOfFeed(feed) + YepConfig.FeedBiggerImageCell.imageSize.height + 15
+
+        return ceil(height)
+    }
+    
     override init(style: UITableViewCellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
 
diff --git a/Yep/Views/Cells/Feed/FeedNormalImagesCell.swift b/Yep/Views/Cells/Feed/FeedNormalImagesCell.swift
index d5a62789..5295aa0c 100644
--- a/Yep/Views/Cells/Feed/FeedNormalImagesCell.swift
+++ b/Yep/Views/Cells/Feed/FeedNormalImagesCell.swift
@@ -52,6 +52,13 @@ class FeedNormalImagesCell: FeedBasicCell {
         return imageView
     }()
 
+    override class func heightOfFeed(feed: DiscoveredFeed) -> CGFloat {
+
+        let height = super.heightOfFeed(feed) + YepConfig.FeedNormalImagesCell.imageSize.height + 15
+
+        return ceil(height)
+    }
+    
     var imageViews: [UIImageView] = []
 
     override init(style: UITableViewCellStyle, reuseIdentifier: String?) {