diff --git a/Signal/src/view controllers/MessagesViewController.h b/Signal/src/view controllers/MessagesViewController.h
index df6af04ab..d9ecec270 100644
--- a/Signal/src/view controllers/MessagesViewController.h	
+++ b/Signal/src/view controllers/MessagesViewController.h	
@@ -16,7 +16,7 @@
 
 @interface MessagesViewController : JSQMessagesViewController   <UIImagePickerControllerDelegate,
                                                                 UINavigationControllerDelegate,
-                                                                UITextViewDelegate,AVAudioRecorderDelegate,AVAudioPlayerDelegate>
+                                                                UITextViewDelegate,AVAudioRecorderDelegate,AVAudioPlayerDelegate, UIGestureRecognizerDelegate>
 
 
 @property (nonatomic, retain) APNavigationController *navController;
diff --git a/Signal/src/view controllers/MessagesViewController.m b/Signal/src/view controllers/MessagesViewController.m
index 0029867e9..134502eab 100644
--- a/Signal/src/view controllers/MessagesViewController.m	
+++ b/Signal/src/view controllers/MessagesViewController.m	
@@ -202,6 +202,8 @@ typedef enum : NSUInteger {
                                                  name:UIApplicationWillEnterForegroundNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cancelReadTimer)
                                                  name:UIApplicationDidEnterBackgroundNotification object:nil];
+    
+    self.navigationController.interactivePopGestureRecognizer.delegate = self; // Swipe back to inbox fix. See http://stackoverflow.com/questions/19054625/changing-back-button-in-ios-7-disables-swipe-to-navigate-back
 }
 
 -(void) initializeTextView {