 
         var hasMedia = false
 
-        if let attachment = feed.attachment {
-            if case let .Images(attachments) = attachment {
-                hasMedia = !attachments.isEmpty
+        if let attachment = feed.attachment, case let .Images(attachments) = attachment {
+            hasMedia = !attachments.isEmpty
+
+            mediaCollectionView.hidden = hasMedia ? false : true
+
+            if !mediaCollectionView.hidden {
+                let y = messageTextView.frame.origin.y + messageTextView.frame.height + 15
+                let height: CGFloat = attachments.count == 1 ? feedAttachmentBiggerImageSize.height : feedAttachmentImageSize.height
+                mediaCollectionView.frame = CGRect(x: 0, y: y, width: screenWidth, height: height)
 
                 self.attachments = attachments
             }
+
+        } else {
+            mediaCollectionView.hidden = true
         }
-
-//        if attachments.count > 1 {
-//            leftBottomLabelTopConstraint.constant = hasMedia ? (15 + feedAttachmentImageSize.height + 15) : 15
-//        } else {
-//            leftBottomLabelTopConstraint.constant = hasMedia ? (15 + feedAttachmentBiggerImageSize.height + 15) : 15
-//        }
-
-        mediaCollectionView.hidden = hasMedia ? false : true
     }
 }
 


    var attachments = [DiscoveredAttachment]() {
        didSet {

            /*
            let oldHeight = collectionViewHeight.constant
            let newHeight: CGFloat
            if attachments.count == 1 {
                newHeight = feedAttachmentBiggerImageSize.height
            } else {
                newHeight = feedAttachmentImageSize.height
            }
            if newHeight != oldHeight {
                collectionViewHeight.constant = newHeight
            }
            */

            mediaCollectionView.reloadData()
        }

let feedAttachmentBiggerImageSize = CGSize(width: 160, height: 160)

private let feedMediaCellID = "FeedMediaCell"
private let screenWidth: CGFloat = UIScreen.mainScreen().bounds.width

class FeedCell: FeedBasicCell {

