 
                     cell.configureWithMessage(message, messageImagePreferredWidth: messageImagePreferredWidth, messageImagePreferredHeight: messageImagePreferredHeight, messageImagePreferredAspectRatio: messageImagePreferredAspectRatio, mediaTapAction: { [unowned self] in
 
-                        self.performSegueWithIdentifier("showMessageMedia", sender: message)
+                        //self.performSegueWithIdentifier("showMessageMedia", sender: message)
+
+                        let mediaPreviewView = MediaPreviewView()
+                        mediaPreviewView.showMessage(message, inView: self.view.window)
 
                     }, collectionView: collectionView, indexPath: indexPath)
                     


                    cell.configureWithMessage(message, messageImagePreferredWidth: messageImagePreferredWidth, messageImagePreferredHeight: messageImagePreferredHeight, messageImagePreferredAspectRatio: messageImagePreferredAspectRatio, mediaTapAction: { [unowned self] in

                        self.performSegueWithIdentifier("showMessageMedia", sender: message)

                    }, collectionView: collectionView, indexPath: indexPath)


                        } else {
                            //self.performSegueWithIdentifier("showMessageMedia", sender: message)

                            let mediaPreviewView = MediaPreviewView()
                            mediaPreviewView.showMessage(message, inView: self.view.window)
                        }

                    }, collectionView: collectionView, indexPath: indexPath)
