diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index 58dad2bf..0c8e90e7 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -149,10 +149,29 @@ class ConversationViewController: BaseViewController {
     lazy var moreView: ConversationMoreView = ConversationMoreView()
 
     lazy var moreMessageTypesView: MoreMessageTypesView = {
+
         let view =  MoreMessageTypesView()
+
         view.pickLocationAction = { [weak self] in
             self?.performSegueWithIdentifier("presentPickLocation", sender: nil)
         }
+
+        view.choosePhotoAction = { [weak self] in
+
+            let openCameraRoll: ProposerAction = { [weak self] in
+                if UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceType.PhotoLibrary){
+                    if let strongSelf = self {
+                        strongSelf.imagePicker.sourceType = .PhotoLibrary
+                        strongSelf.presentViewController(strongSelf.imagePicker, animated: true, completion: nil)
+                    }
+                }
+            }
+
+            proposeToAccess(.Photos, agreed: openCameraRoll, rejected: {
+                self?.alertCanNotAccessCameraRoll()
+            })
+        }
+
         return view
         }()
 
diff --git a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
index 3768a03a..ee09d850 100644
--- a/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
+++ b/Yep/Views/MoreMessageTypes/MoreMessageTypesView.swift
@@ -34,9 +34,9 @@ class MoreMessageTypesView: UIView {
         }()
 
 
+    var choosePhotoAction: (() -> Void)?
     var pickLocationAction: (() -> Void)?
 
-
     var tableViewBottomConstraint: NSLayoutConstraint?
 
     func showInView(view: UIView) {
@@ -237,6 +237,10 @@ extension MoreMessageTypesView: UITableViewDataSource, UITableViewDelegate {
 
         if let row = Row(rawValue: indexPath.row) {
             switch row {
+            case .PickPhotos:
+                hideAndDo {
+                    choosePhotoAction?()
+                }
             case .Location:
                 hideAndDo {
                     pickLocationAction?()