diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index 3515be4a..5c4645f9 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -114,6 +114,8 @@ class ConversationViewController: BaseViewController {
 
     let sectionInsetTop: CGFloat = 10
     let sectionInsetBottom: CGFloat = 10
+    
+    var originUINavigationControllerDelegate: UINavigationControllerDelegate!
 
     let messageTextAttributes = [NSFontAttributeName: UIFont.chatTextFont()]
     lazy var messageTextLabelMaxWidth: CGFloat = {
@@ -186,10 +188,17 @@ class ConversationViewController: BaseViewController {
 
         YepUserDefaults.avatarURLString.removeListenerWithName(Listener.Avatar)
     }
+    
+    override func viewWillAppear(animated: Bool) {
+        super.viewWillAppear(animated)
+        navigationController?.delegate = originUINavigationControllerDelegate
+    }
 
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        originUINavigationControllerDelegate = navigationController!.delegate
+        
         if let gestures = navigationController?.view.gestureRecognizers {
             for recognizer in gestures
             {