diff --git a/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities/MessageOperationsUtilities.cpp b/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities/MessageOperationsUtilities.cpp
index c9199059c..f9f0c0694 100644
--- a/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities/MessageOperationsUtilities.cpp
+++ b/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities/MessageOperationsUtilities.cpp
@@ -1,24 +1,75 @@
 #include "MessageOperationsUtilities.h"
 #include "MessageSpecs.h"
 
 #include <folly/String.h>
 
 namespace comm {
+ClientDBMessageInfo
+MessageOperationsUtilities::translateRawMessageInfoToClientDBMessageInfo(
+    const folly::dynamic &rawMessageInfo) {
+  std::string id = rawMessageInfo.count("id")
+      ? rawMessageInfo["id"].asString()
+      : rawMessageInfo["localID"].asString();
+  std::string thread = rawMessageInfo["threadID"].asString();
+  std::string user = rawMessageInfo["creatorID"].asString();
+
+  std::unique_ptr<std::string> localID = nullptr;
+  if (rawMessageInfo.count("localID")) {
+    localID =
+        std::make_unique<std::string>(rawMessageInfo["localID"].asString());
+  }
+
+  int type = rawMessageInfo["type"].asInt();
+  MessageType messageType = static_cast<MessageType>(type);
+  int64_t time = rawMessageInfo["time"].asInt();
+
+  std::unique_ptr<int> futureType = nullptr;
+  if (messageType == MessageType::UNSUPPORTED) {
+    futureType = std::make_unique<int>(
+        rawMessageInfo["unsupportedMessageInfo"]["type"].asInt());
+  }
+
+  std::unique_ptr<std::string> content = nullptr;
+  if (messageSpecsHolder.find(messageType) != messageSpecsHolder.end()) {
+    content = messageSpecsHolder.at(messageType)
+                  ->messageContentForClientDB(rawMessageInfo);
+  }
+  std::vector<Media> mediaVector;
+  if (messageType == MessageType::IMAGES ||
+      messageType == MessageType::MULTIMEDIA) {
+    for (const auto &media : rawMessageInfo["media"]) {
+      mediaVector.push_back(
+          translateMediaToClientDBMediaInfo(media, id, thread));
+    }
+  }
+  return {
+      Message{
+          id,
+          std::move(localID),
+          thread,
+          user,
+          type,
+          std::move(futureType),
+          std::move(content),
+          time},
+      std::move(mediaVector)};
+}
+
 Media MessageOperationsUtilities::translateMediaToClientDBMediaInfo(
     const folly::dynamic &rawMediaInfo,
     const std::string &container,
     const std::string &thread) {
   std::string id = rawMediaInfo["id"].asString();
   std::string uri = rawMediaInfo["uri"].asString();
   std::string type = rawMediaInfo["type"].asString();
   folly::dynamic extrasData =
       folly::dynamic::object("dimensions", rawMediaInfo["dimensions"])(
           "loop", (type == "video") ? rawMediaInfo["loop"] : false);
   if (rawMediaInfo.count("localMediaSelection")) {
     extrasData["local_media_selection"] = rawMediaInfo["localMediaSelection"];
   }
   std::string extras = folly::toJson(extrasData);
   return Media{id, container, thread, uri, type, extras};
 }
 
 } // namespace comm