diff --git a/CHANGES.rst b/CHANGES.rst
index 5dd055bf1..8cdeb7417 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,8 +1,8 @@
-Changes in 0.6.18 ()
+Changes in 0.6.18 (2018-07-03)
 ===============================================
 
 Improvements:
- * Upgrade MatrixKit version ().
+ * Upgrade MatrixKit version (v0.7.15).
  * RoomVC: Add a re-request keys button on message unable to decrypt (#1879).
  * Analytics: Move code from AppDelegate to a dedicated class: Analytics.
  * Analytics: Track Matrix SDK stats (time to startup the app).
@@ -12,6 +12,7 @@ Improvements:
 
 Bug fix:
  * RoomVC: Read receipts processing dramatically slows down UI (#1899).
+ * Lag in typing (#1820).
  * E2E messages not decrypted in notifs after logging back in (#1914).
 
 Changes in 0.6.17 (2018-06-01)
diff --git a/Podfile b/Podfile
index 7d537bedb..d9d427d94 100644
--- a/Podfile
+++ b/Podfile
@@ -9,7 +9,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 
 # Different flavours of pods to MatrixKit
 # The current MatrixKit pod version
-$matrixKitVersion = '0.7.14'
+$matrixKitVersion = '0.7.15'
 
 # The develop branch version
 #$matrixKitVersion = 'develop'
diff --git a/Podfile.lock b/Podfile.lock
index 01b0c1cae..bbcc75a9a 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -37,40 +37,40 @@ PODS:
     - DTFoundation/Core
   - DTFoundation/UIKit (1.7.13):
     - DTFoundation/Core
-  - GBDeviceInfo (5.1.0):
-    - GBDeviceInfo/Core (= 5.1.0)
-  - GBDeviceInfo/Core (5.1.0)
+  - GBDeviceInfo (5.2.0):
+    - GBDeviceInfo/Core (= 5.2.0)
+  - GBDeviceInfo/Core (5.2.0)
   - GZIP (1.2.1)
   - HPGrowingTextView (1.1)
   - libPhoneNumber-iOS (0.9.13)
-  - MatrixKit (0.7.14):
+  - MatrixKit (0.7.15):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.21)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixKit/Core (= 0.7.14)
-    - MatrixSDK (= 0.10.11)
-  - MatrixKit/AppExtension (0.7.14):
+    - MatrixKit/Core (= 0.7.15)
+    - MatrixSDK (= 0.10.12)
+  - MatrixKit/AppExtension (0.7.15):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.21)
     - DTCoreText/Extension
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.10.11)
-  - MatrixKit/Core (0.7.14):
+    - MatrixSDK (= 0.10.12)
+  - MatrixKit/Core (0.7.15):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.21)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.10.11)
-  - MatrixSDK (0.10.11):
-    - MatrixSDK/Core (= 0.10.11)
-  - MatrixSDK/Core (0.10.11):
+    - MatrixSDK (= 0.10.12)
+  - MatrixSDK (0.10.12):
+    - MatrixSDK/Core (= 0.10.12)
+  - MatrixSDK/Core (0.10.12):
     - AFNetworking (~> 3.2.0)
     - GZIP (~> 1.2.1)
     - OLMKit (~> 2.2.2)
-    - Realm (~> 3.3.2)
-  - MatrixSDK/JingleCallStack (0.10.11):
+    - Realm (~> 3.6.0)
+  - MatrixSDK/JingleCallStack (0.10.12):
     - MatrixSDK/Core
     - WebRTC (= 63.11.20455)
   - OLMKit (2.2.2):
@@ -81,17 +81,17 @@ PODS:
   - PiwikTracker (4.4.2):
     - PiwikTracker/Core (= 4.4.2)
   - PiwikTracker/Core (4.4.2)
-  - Realm (3.3.2):
-    - Realm/Headers (= 3.3.2)
-  - Realm/Headers (3.3.2)
+  - Realm (3.6.0):
+    - Realm/Headers (= 3.6.0)
+  - Realm/Headers (3.6.0)
   - WebRTC (63.11.20455)
 
 DEPENDENCIES:
   - cmark
   - DTCoreText
-  - GBDeviceInfo (~> 5.1.0)
-  - MatrixKit (= 0.7.14)
-  - MatrixKit/AppExtension (= 0.7.14)
+  - GBDeviceInfo (~> 5.2.0)
+  - MatrixKit (= 0.7.15)
+  - MatrixKit/AppExtension (= 0.7.15)
   - MatrixSDK/JingleCallStack
   - OLMKit
   - PiwikTracker (from `https://github.com/manuroe/matomo-sdk-ios.git`, branch `feature/CustomVariables`)
@@ -127,17 +127,17 @@ SPEC CHECKSUMS:
   cmark: ec0275215b504780287b6fca360224e384368af8
   DTCoreText: e5d688cffc9f6a61eddd1a4f94e2046851230de3
   DTFoundation: f03be9fd786f11e505bb8fc44e2a3732bf0917df
-  GBDeviceInfo: 8e43440ae1264d9a79beea81800363cf192ce322
+  GBDeviceInfo: 2c65ceb9404f9079264d4c238f5b81916fdfc5e2
   GZIP: 7ee835f989fb3c6ea79005fc90b8fa6af710a70d
   HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
   libPhoneNumber-iOS: e444379ac18bbfbdefad571da735b2cd7e096caa
-  MatrixKit: ca192403abc03229f5cc5c193bd24a292e302304
-  MatrixSDK: abb44d24e0426f3734630362c736d96446a629a3
+  MatrixKit: 5668775ddcb36939f22cb5e76dcf617980c52c75
+  MatrixSDK: 5d5eae9a9a098ec130022da4a4925332df8df1d9
   OLMKit: b9d8c0ffee9ea8c45bc0aaa9afb47f93fba7efbd
   PiwikTracker: 42862c7b13028065c3dfd36b4dc38db8a5765acf
-  Realm: d927fbf66df5532cfafc08afb5f7e53ded37b894
+  Realm: 08b464b462d4f31bbd4ba5f5a1c8722ef0a700b7
   WebRTC: f2a6203584745fe53532633397557876b5d71640
 
-PODFILE CHECKSUM: f62acabc542b9493f2d704d8c5163a53051b1979
+PODFILE CHECKSUM: 948cd5479b6467245ee83ba82304e73d83c7e4e2
 
 COCOAPODS: 1.5.3
diff --git a/Riot/Info.plist b/Riot/Info.plist
index cbd7ee6ea..8377d7276 100644
--- a/Riot/Info.plist
+++ b/Riot/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.17</string>
+	<string>0.6.18</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.6.17</string>
+	<string>0.6.18</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<true/>
 	<key>ITSEncryptionExportComplianceCode</key>
diff --git a/RiotShareExtension/Info.plist b/RiotShareExtension/Info.plist
index 733c119fa..fd320e7e7 100644
--- a/RiotShareExtension/Info.plist
+++ b/RiotShareExtension/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.17</string>
+	<string>0.6.18</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>
diff --git a/SiriIntents/Info.plist b/SiriIntents/Info.plist
index b9785df49..ab1b6d34b 100644
--- a/SiriIntents/Info.plist
+++ b/SiriIntents/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.17</string>
+	<string>0.6.18</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>