diff --git a/native/cpp/CommonCpp/DatabaseManagers/entities/MessageType.h b/native/cpp/CommonCpp/DatabaseManagers/entities/MessageType.h
new file mode 100644
--- /dev/null
+++ b/native/cpp/CommonCpp/DatabaseManagers/entities/MessageType.h
@@ -0,0 +1,31 @@
+#pragma once
+
+namespace comm {
+
+enum class MessageType {
+  TEXT,
+  CREATE_THREAD,
+  ADD_MEMBERS,
+  CREATE_SUB_THREAD,
+  CHANGE_SETTINGS,
+  REMOVE_MEMBERS,
+  CHANGE_ROLE,
+  LEAVE_THREAD,
+  JOIN_THREAD,
+  CREATE_ENTRY,
+  EDIT_ENTRY,
+  DELETE_ENTRY,
+  RESTORE_ENTRY,
+  UNSUPPORTED,
+  IMAGES,
+  MULTIMEDIA,
+  LEGACY_UPDATE_RELATIONSHIP,
+  SIDEBAR_SOURCE,
+  CREATE_SIDEBAR,
+  REACTION,
+  EDIT_MESSAGE,
+  TOGGLE_PIN,
+  UPDATE_RELATIONSHIP,
+};
+
+} // namespace comm
diff --git a/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities/MessageSpecs.h b/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities/MessageSpecs.h
--- a/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities/MessageSpecs.h
+++ b/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities/MessageSpecs.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "../../../DatabaseManagers/entities/MessageType.h"
 #include "MessageSpecs/ChangeRoleMessageSpec.h"
 #include "MessageSpecs/ChangeSettingsMessageSpec.h"
 #include "MessageSpecs/CreateEntryMessageSpec.h"
@@ -22,32 +23,6 @@
 
 namespace comm {
 
-enum class MessageType {
-  TEXT,
-  CREATE_THREAD,
-  ADD_MEMBERS,
-  CREATE_SUB_THREAD,
-  CHANGE_SETTINGS,
-  REMOVE_MEMBERS,
-  CHANGE_ROLE,
-  LEAVE_THREAD,
-  JOIN_THREAD,
-  CREATE_ENTRY,
-  EDIT_ENTRY,
-  DELETE_ENTRY,
-  RESTORE_ENTRY,
-  UNSUPPORTED,
-  IMAGES,
-  MULTIMEDIA,
-  LEGACY_UPDATE_RELATIONSHIP,
-  SIDEBAR_SOURCE,
-  CREATE_SIDEBAR,
-  REACTION,
-  EDIT_MESSAGE,
-  TOGGLE_PIN,
-  UPDATE_RELATIONSHIP,
-};
-
 const std::map<MessageType, std::unique_ptr<MessageSpec>> messageSpecsHolder =
     []() {
       std::map<MessageType, std::unique_ptr<MessageSpec>>