diff --git a/CHANGES.rst b/CHANGES.rst
index b8cee48f4..0b65764ff 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,10 +1,19 @@
-Changes in 0.8.4 (2019-03-xx)
+Changes in 0.8.5 (2019-xx-xx)
 ===============================================
 
 Improvements:
+
+Bug fix:
+
+Changes in 0.8.4 (2019-03-21)
+===============================================
+
+Improvements:
+ * Upgrade MatrixKit version ([v0.9.8](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.9.8)).
  * Share extension: Remove image large size resizing choice if output dimension is too high to prevent memory limit exception (PR #2342).
  
 Bug fix:
+ * Unable to open a file attachment of a room message (#2338).
 
 Changes in 0.8.3 (2019-03-13)
 ===============================================
diff --git a/Podfile b/Podfile
index 531d95c29..d77789509 100644
--- a/Podfile
+++ b/Podfile
@@ -7,7 +7,7 @@ use_frameworks!
 
 # Different flavours of pods to MatrixKit
 # The current MatrixKit pod version
-$matrixKitVersion = '0.9.7'
+$matrixKitVersion = '0.9.8'
 
 # The develop branch version
 #$matrixKitVersion = 'develop'
diff --git a/Podfile.lock b/Podfile.lock
index e0324ce2a..fd8d95e91 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -44,38 +44,38 @@ PODS:
   - HPGrowingTextView (1.1)
   - libbase58 (0.1.4)
   - libPhoneNumber-iOS (0.9.13)
-  - MatrixKit (0.9.7):
+  - MatrixKit (0.9.8):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.21)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixKit/Core (= 0.9.7)
-    - MatrixSDK (= 0.12.3)
-  - MatrixKit/AppExtension (0.9.7):
+    - MatrixKit/Core (= 0.9.8)
+    - MatrixSDK (= 0.12.4)
+  - MatrixKit/AppExtension (0.9.8):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.21)
     - DTCoreText/Extension
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.12.3)
-  - MatrixKit/Core (0.9.7):
+    - MatrixSDK (= 0.12.4)
+  - MatrixKit/Core (0.9.8):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.21)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.12.3)
-  - MatrixSDK (0.12.3):
-    - MatrixSDK/Core (= 0.12.3)
-  - MatrixSDK/Core (0.12.3):
+    - MatrixSDK (= 0.12.4)
+  - MatrixSDK (0.12.4):
+    - MatrixSDK/Core (= 0.12.4)
+  - MatrixSDK/Core (0.12.4):
     - AFNetworking (~> 3.2.0)
     - GZIP (~> 1.2.2)
     - libbase58 (~> 0.1.4)
     - OLMKit (~> 3.0.0)
     - Realm (~> 3.13.1)
-  - MatrixSDK/JingleCallStack (0.12.3):
+  - MatrixSDK/JingleCallStack (0.12.4):
     - MatrixSDK/Core
     - WebRTC (= 63.11.20455)
-  - MatrixSDK/SwiftSupport (0.12.3):
+  - MatrixSDK/SwiftSupport (0.12.4):
     - MatrixSDK/Core
   - OLMKit (3.0.0):
     - OLMKit/olmc (= 3.0.0)
@@ -102,8 +102,8 @@ DEPENDENCIES:
   - cmark
   - DTCoreText
   - GBDeviceInfo (~> 5.2.0)
-  - MatrixKit (= 0.9.7)
-  - MatrixKit/AppExtension (= 0.9.7)
+  - MatrixKit (= 0.9.8)
+  - MatrixKit/AppExtension (= 0.9.8)
   - MatrixSDK/JingleCallStack
   - MatrixSDK/SwiftSupport
   - OLMKit
@@ -154,8 +154,8 @@ SPEC CHECKSUMS:
   HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
   libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
   libPhoneNumber-iOS: e444379ac18bbfbdefad571da735b2cd7e096caa
-  MatrixKit: da43b16842298fe0987ca8a98267bee775c10a35
-  MatrixSDK: 36c1a0da01a2745d4ffcca73e080610f05d47009
+  MatrixKit: 098ddd270d1dec86a85ea93a85a00e37b2d80c11
+  MatrixSDK: 310efb69f70b4d7772f6f134b06fbb9ec238e6a7
   OLMKit: 88eda69110489f817d59bcb4353b7c247570aa4f
   PiwikTracker: 42862c7b13028065c3dfd36b4dc38db8a5765acf
   Realm: 50071da38fe079e0735e47c9f2eae738c68c5996
@@ -165,6 +165,6 @@ SPEC CHECKSUMS:
   WebRTC: f2a6203584745fe53532633397557876b5d71640
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
 
-PODFILE CHECKSUM: 033d67e4bbc8604bb6e37bac1d0ca1d90b8688dd
+PODFILE CHECKSUM: 63fb661f957b3fa4c00765bc4d28bed41892847c
 
 COCOAPODS: 1.6.1