diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2496f2f..bd579b20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -333,7 +333,7 @@ if(USE_BUNDLED_MTXCLIENT)
 	FetchContent_Declare(
 		MatrixClient
 		GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
-		GIT_TAG        03b5008a05f895e91e3968de7b68db50f6c41b2a
+		GIT_TAG        19e7d680bf5e8bc6a25586a225e881fe4e60d9fb
 		)
 	FetchContent_MakeAvailable(MatrixClient)
 else()
diff --git a/src/CacheStructs.h b/src/CacheStructs.h
index 275d20cb..2051afc8 100644
--- a/src/CacheStructs.h
+++ b/src/CacheStructs.h
@@ -29,10 +29,10 @@ struct ReadReceiptKey
 };
 
 void
-to_json(json &j, const ReadReceiptKey &key);
+to_json(nlohmann::json &j, const ReadReceiptKey &key);
 
 void
-from_json(const json &j, ReadReceiptKey &key);
+from_json(const nlohmann::json &j, ReadReceiptKey &key);
 
 struct DescInfo
 {
@@ -68,9 +68,9 @@ struct RoomInfo
 };
 
 void
-to_json(json &j, const RoomInfo &info);
+to_json(nlohmann::json &j, const RoomInfo &info);
 void
-from_json(const json &j, RoomInfo &info);
+from_json(const nlohmann::json &j, RoomInfo &info);
 
 //! Basic information per member;
 struct MemberInfo
@@ -80,9 +80,9 @@ struct MemberInfo
 };
 
 void
-to_json(json &j, const MemberInfo &info);
+to_json(nlohmann::json &j, const MemberInfo &info);
 void
-from_json(const json &j, MemberInfo &info);
+from_json(const nlohmann::json &j, MemberInfo &info);
 
 struct RoomSearchResult
 {
diff --git a/src/Utils.h b/src/Utils.h
index 505d8e6a..ea0df21f 100644
--- a/src/Utils.h
+++ b/src/Utils.h
@@ -272,7 +272,7 @@ getMessageBody(const RoomMessageT &event)
         if (event.content.format.empty())
                 return QString::fromStdString(event.content.body).toHtmlEscaped();
 
-        if (event.content.format != common::FORMAT_MSG_TYPE)
+        if (event.content.format != mtx::common::FORMAT_MSG_TYPE)
                 return QString::fromStdString(event.content.body).toHtmlEscaped();
 
         return QString::fromStdString(event.content.formatted_body);