diff --git a/Podfile.lock b/Podfile.lock
index e0c154187..e6a59f6aa 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -133,7 +133,7 @@ CHECKOUT OPTIONS:
     :commit: 28afe5c1dbcfdea73d147e464c53d191d1e3ea50
     :git: https://github.com/WhisperSystems/SignalProtocolKit.git
   JSQMessagesViewController:
-    :commit: 5d7a5f99f982d397cb10e852bceef5d055b80a3c
+    :commit: 560e59f8e4f35612c20d6d9387d1d81789f74b0f
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SocketRocket:
     :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf
diff --git a/Signal/translations/bin/auto-genstrings b/Signal/translations/bin/auto-genstrings
index cf113242f..f788a0656 100755
--- a/Signal/translations/bin/auto-genstrings
+++ b/Signal/translations/bin/auto-genstrings
@@ -2,6 +2,10 @@
 
 set -e
 
+BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+REPO_ROOT=$BIN_DIR/../../..
+cd $REPO_ROOT
+
 SSK_DIR="../SignalServiceKit/src"
 
 pushd $SSK_DIR
@@ -22,10 +26,6 @@ TARGETS="Signal/src ${SSK_DIR}"
 TMP="$(mktemp -d)"
 STRINGFILE="Signal/translations/en.lproj/Localizable.strings"
 
-BIN_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-REPO_ROOT=$BIN_DIR/../../..
-cd $REPO_ROOT
-
 for TARGET_DIR in $TARGETS
 do
 
@@ -58,3 +58,21 @@ echo "$OLDUTF8" | grep -Eo '^".*"' | \
 		if($2 ~ /"[;]*$/){$2 = " = "$2}; \
 		if($2 ~ /"$/){$2 = $2";"}; \
 		print}' - <(echo "$NEWUTF8") > $STRINGFILE
+
+# Copy in strings from JSQMessagesViewController
+#
+# We have a wider array of translators than JSQ, and it's easier for our
+# translators to translate for us directly rather than to direct them to the
+# now defunct JSQMessagesView project.
+
+echo "Copying strings from JSQMessagesViewController"
+JSQ_STRINGS_PATH="../JSQMessagesViewController/JSQMessagesViewController/Assets/JSQMessagesAssets.bundle/Base.lproj/JSQMessages.strings"
+if [ ! -f $JSQ_STRINGS_PATH ]; then
+  echo "[!] Error. Expected to find strings for JSQMessagesViewController at ${JSQ_STRINGS_PATH}"
+  exit 1
+fi
+
+echo "
+// Strings Copied in from JSQMessagesViewController" >> $STRINGFILE
+cat $JSQ_STRINGS_PATH  | grep -v "^//" >> $STRINGFILE
+
diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings
index df3932cd0..6f3e4d2cd 100644
--- a/Signal/translations/en.lproj/Localizable.strings
+++ b/Signal/translations/en.lproj/Localizable.strings
@@ -646,9 +646,6 @@
 /* Call setup status label */
 "IN_CALL_SECURING" = "Answered. Securing…";
 
-/* Call setup status label */
-"IN_CALL_TALKING" = "Secured. Active.";
-
 /* Call setup status label */
 "IN_CALL_TERMINATED" = "Call Ended.";
 
@@ -1509,3 +1506,20 @@
 
 /* Info message embedding a {{time amount}}, see the *_TIME_AMOUNT strings for context. */
 "YOU_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION" = "You set disappearing message time to %@.";
+
+// Strings Copied in from JSQMessagesViewController
+
+
+"load_earlier_messages" = "Load Earlier Messages";
+
+"send" = "Send";
+
+"new_message" = "New Message";
+
+"text_message_accessibility_label" = "%@: %@";
+
+"media_message_accessibility_label" = "%@: media message";
+
+"accessory_button_accessibility_label" = "Share media";
+
+"new_message_received_accessibility_announcement" = "New message received";