diff --git a/Podfile b/Podfile
index db3d1260b..341f81bf6 100644
--- a/Podfile
+++ b/Podfile
@@ -5,12 +5,12 @@ inhibit_all_warnings!
 link_with ["Signal", "SignalTests"]
 
 pod 'OpenSSL',                    '~> 1.0.203'
-pod 'libPhoneNumber-iOS',         '~> 0.8.2'
+pod 'libPhoneNumber-iOS',         '~> 0.8.5'
 pod 'AxolotlKit',                 '~> 0.7'
 pod 'PastelogKit',                '~> 1.2'
 pod 'TwistedOakCollapsingFutures','~> 1.0'
 pod 'AFNetworking',               '~> 2.5.3'
-pod 'Mantle',                     '~> 2.0'
+pod 'Mantle',                     '~> 2.0.2'
 pod 'FFCircularProgressView',     '>= 0.1'
 pod 'SCWaveformView',             '~> 1.0'
 pod 'YapDatabase/SQLCipher',      '~> 2.6.4'
diff --git a/Podfile.lock b/Podfile.lock
index 2c9383609..0fe2e4c45 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -37,10 +37,10 @@ PODS:
   - JSQMessagesViewController (7.1.0):
     - JSQSystemSoundPlayer (~> 2.0.1)
   - JSQSystemSoundPlayer (2.0.1)
-  - libPhoneNumber-iOS (0.8.4)
-  - Mantle (2.0):
-    - Mantle/extobjc (= 2.0)
-  - Mantle/extobjc (2.0)
+  - libPhoneNumber-iOS (0.8.5)
+  - Mantle (2.0.2):
+    - Mantle/extobjc (= 2.0.2)
+  - Mantle/extobjc (2.0.2)
   - OpenSSL (1.0.203)
   - PastelogKit (1.2):
     - CocoaLumberjack (~> 1.9)
@@ -68,8 +68,8 @@ DEPENDENCIES:
   - FFCircularProgressView (>= 0.1)
   - JSQMessagesViewController (from `https://github.com/WhisperSystems/JSQMessagesViewController`,
     commit `e5582fef8a6b3e35f8070361ef37237222da712b`)
-  - libPhoneNumber-iOS (~> 0.8.2)
-  - Mantle (~> 2.0)
+  - libPhoneNumber-iOS (~> 0.8.5)
+  - Mantle (~> 2.0.2)
   - OpenSSL (~> 1.0.203)
   - PastelogKit (~> 1.2)
   - SCWaveformView (~> 1.0)
@@ -115,8 +115,8 @@ SPEC CHECKSUMS:
   HKDFKit: c058305d6f64b84f28c50bd7aa89574625bcb62a
   JSQMessagesViewController: ca11f86fa68ca70835f05e169df9244147c1dc40
   JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
-  libPhoneNumber-iOS: dbfc7b4128510a4955df3e5a6f125393fc9ebc2f
-  Mantle: d7c75b6fb789b20f7ae30cd0d09435fe545896ff
+  libPhoneNumber-iOS: b8ccd23576379caca37c7cbdd554addf384459ed
+  Mantle: 967fd31ea0220890b2e76589198996b534bb3fb1
   OpenSSL: 65f5de70414ee909cea517ded684d8ef855b02b4
   PastelogKit: c73795b8c0bbf33ea45d3b6a5eabb373be3d5955
   ProtocolBuffers: 9a4a171c0c7cc8f21dd29aeca4f9ac775d84a880
diff --git a/Pods b/Pods
index c675c9b58..41c8315a3 160000
--- a/Pods
+++ b/Pods
@@ -1 +1 @@
-Subproject commit c675c9b5833f04bbf377e7921010d9b8191b6c56
+Subproject commit 41c8315a35ded3d7714fbb6daee02ee972aea54f
diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist
index 759c4d206..885331c83 100644
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1</string>
+	<string>2.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.1.60</string>
+	<string>2.1.65</string>
 	<key>LOGS_EMAIL</key>
 	<string>support@whispersystems.org</string>
 	<key>LOGS_URL</key>
diff --git a/Signal/src/contact/ContactsManager.m b/Signal/src/contact/ContactsManager.m
index 4a48ce04c..61f3ae4fb 100644
--- a/Signal/src/contact/ContactsManager.m
+++ b/Signal/src/contact/ContactsManager.m
@@ -346,7 +346,6 @@ void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef in
         }
     }
     return allContacts;
-    
 }
 
 - (NSArray*)recordsForContacts:(NSArray*) contacts{
diff --git a/Signal/translations/ar.lproj/Localizable.strings b/Signal/translations/ar.lproj/Localizable.strings
index c5c9cb170..c2b5d5f4f 100644
Binary files a/Signal/translations/ar.lproj/Localizable.strings and b/Signal/translations/ar.lproj/Localizable.strings differ
diff --git a/Signal/translations/de.lproj/Localizable.strings b/Signal/translations/de.lproj/Localizable.strings
index ceafea90a..5834205b2 100644
Binary files a/Signal/translations/de.lproj/Localizable.strings and b/Signal/translations/de.lproj/Localizable.strings differ
diff --git a/Signal/translations/es.lproj/Localizable.strings b/Signal/translations/es.lproj/Localizable.strings
index f1333964d..620070548 100644
Binary files a/Signal/translations/es.lproj/Localizable.strings and b/Signal/translations/es.lproj/Localizable.strings differ
diff --git a/Signal/translations/fi.lproj/Localizable.strings b/Signal/translations/fi.lproj/Localizable.strings
index c3c9843e1..5c1e557ef 100644
Binary files a/Signal/translations/fi.lproj/Localizable.strings and b/Signal/translations/fi.lproj/Localizable.strings differ
diff --git a/Signal/translations/fr.lproj/Localizable.strings b/Signal/translations/fr.lproj/Localizable.strings
index add9db467..35e6db40d 100644
Binary files a/Signal/translations/fr.lproj/Localizable.strings and b/Signal/translations/fr.lproj/Localizable.strings differ
diff --git a/Signal/translations/hu.lproj/Localizable.strings b/Signal/translations/hu.lproj/Localizable.strings
index e2f009d5d..85627b37f 100644
Binary files a/Signal/translations/hu.lproj/Localizable.strings and b/Signal/translations/hu.lproj/Localizable.strings differ
diff --git a/Signal/translations/nb_NO.lproj/Localizable.strings b/Signal/translations/nb_NO.lproj/Localizable.strings
index 82982318b..56918ebec 100644
Binary files a/Signal/translations/nb_NO.lproj/Localizable.strings and b/Signal/translations/nb_NO.lproj/Localizable.strings differ
diff --git a/Signal/translations/nl.lproj/Localizable.strings b/Signal/translations/nl.lproj/Localizable.strings
index 45a1f2158..af4886539 100644
Binary files a/Signal/translations/nl.lproj/Localizable.strings and b/Signal/translations/nl.lproj/Localizable.strings differ
diff --git a/Signal/translations/sl.lproj/Localizable.strings b/Signal/translations/sl.lproj/Localizable.strings
index dedb465fd..88f323411 100644
Binary files a/Signal/translations/sl.lproj/Localizable.strings and b/Signal/translations/sl.lproj/Localizable.strings differ
diff --git a/Signal/translations/sv_SE.lproj/Localizable.strings b/Signal/translations/sv_SE.lproj/Localizable.strings
index 0b11de6d1..c46f139e7 100644
Binary files a/Signal/translations/sv_SE.lproj/Localizable.strings and b/Signal/translations/sv_SE.lproj/Localizable.strings differ
diff --git a/Signal/translations/tr_TR.lproj/Localizable.strings b/Signal/translations/tr_TR.lproj/Localizable.strings
index 1ef5a2993..f65801a1e 100644
Binary files a/Signal/translations/tr_TR.lproj/Localizable.strings and b/Signal/translations/tr_TR.lproj/Localizable.strings differ