diff --git a/Podfile b/Podfile
index 4714c7451..61ed04674 100644
--- a/Podfile
+++ b/Podfile
@@ -11,8 +11,7 @@ target 'Signal' do
     pod 'SCWaveformView',             '~> 1.0'
     pod 'ZXingObjC'
     pod 'DJWActionSheet'
-    #pod 'JSQMessagesViewController'
-    pod 'JSQMessagesViewController', git: 'https://github.com/WhisperSystems/JSQMessagesViewController.git', branch: 'fix-intermittent-crash-on-delete'
+    pod 'JSQMessagesViewController'
     target 'SignalTests' do
         inherit! :search_paths
     end
diff --git a/Podfile.lock b/Podfile.lock
index 749acf866..61e1d6495 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -118,7 +118,7 @@ PODS:
 DEPENDENCIES:
   - DJWActionSheet
   - FFCircularProgressView (~> 0.5)
-  - JSQMessagesViewController (from `https://github.com/WhisperSystems/JSQMessagesViewController.git`, branch `fix-intermittent-crash-on-delete`)
+  - JSQMessagesViewController
   - OpenSSL
   - PastelogKit (~> 1.3)
   - SCWaveformView (~> 1.0)
@@ -127,9 +127,6 @@ DEPENDENCIES:
   - ZXingObjC
 
 EXTERNAL SOURCES:
-  JSQMessagesViewController:
-    :branch: fix-intermittent-crash-on-delete
-    :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SignalServiceKit:
     :branch: mkirk/default-to-blocking-sn
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
@@ -137,9 +134,6 @@ EXTERNAL SOURCES:
     :git: https://github.com/facebook/SocketRocket.git
 
 CHECKOUT OPTIONS:
-  JSQMessagesViewController:
-    :commit: 03cde781234ade464dd26914d87e6e95afde1119
-    :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SignalServiceKit:
     :commit: 1ba082356a4678a73485ad17313e9d3eeaae834a
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
@@ -173,6 +167,6 @@ SPEC CHECKSUMS:
   YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
   ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a
 
-PODFILE CHECKSUM: 9dd2ff3f84dd29f6437914f7ab631aeb84003078
+PODFILE CHECKSUM: 7c33f38e6e7478b5f9509c893ca24533c8f98b18
 
 COCOAPODS: 1.0.1