diff --git a/Yep/ViewControllers/MediaPreview/MediaPreviewViewController.swift b/Yep/ViewControllers/MediaPreview/MediaPreviewViewController.swift
index d4ba277e..8926fa71 100644
--- a/Yep/ViewControllers/MediaPreview/MediaPreviewViewController.swift
+++ b/Yep/ViewControllers/MediaPreview/MediaPreviewViewController.swift
@@ -193,6 +193,18 @@ class MediaPreviewViewController: UIViewController {
         view.addGestureRecognizer(swipeDown)
 
         currentIndex = startIndex
+
+        for previewMedia in previewMedias {
+
+            if case let .AttachmentType(attachment) = previewMedia {
+
+                ImageCache.sharedInstance.imageOfAttachment(attachment, withSize: nil, completion: { [weak self] (url, image, _) in
+                    if let image = image {
+                        self?.attachmentImagePool.addImage(image, forKey: attachment.URLString)
+                    }
+                })
+            }
+        }
     }
 
     var isFirstLayoutSubviews = true