diff --git a/native/ios/Comm.xcodeproj/project.pbxproj b/native/ios/Comm.xcodeproj/project.pbxproj
--- a/native/ios/Comm.xcodeproj/project.pbxproj
+++ b/native/ios/Comm.xcodeproj/project.pbxproj
@@ -60,6 +60,8 @@
 		CB4821AF27CFB19D001AB7E1 /* PlatformSpecificTools.mm in Sources */ = {isa = PBXBuildFile; fileRef = 71762A74270D8AAE00F565ED /* PlatformSpecificTools.mm */; };
 		CB4821B127CFB1FA001AB7E1 /* GlobalNetworkSingleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 726E5D762731A5E10032361D /* GlobalNetworkSingleton.cpp */; };
 		CB4821B227CFB20E001AB7E1 /* SQLiteQueryExecutor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71BE84412636A944002849D2 /* SQLiteQueryExecutor.cpp */; };
+		CB8FC08B28291E4100AD5AEB /* MessageOperationsUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CB8FC08828291E4100AD5AEB /* MessageOperationsUtilities.cpp */; };
+		CB8FC08C28291F3A00AD5AEB /* MessageOperationsUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CB8FC08828291E4100AD5AEB /* MessageOperationsUtilities.cpp */; };
 		D7DB6E0F85B2DBE15B01EC21 /* libPods-Comm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 994BEBDD4E4959F69CEA0BC3 /* libPods-Comm.a */; };
 		F02C296C528B51ADAB5AA19D /* libPods-NotificationService.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EE4DCB430B05EC9DE7D7B01 /* libPods-NotificationService.a */; };
 /* End PBXBuildFile section */
@@ -186,6 +188,23 @@
 		CB1648B027CFD07E00394D9D /* CommRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = CommRelease.entitlements; path = Comm/CommRelease.entitlements; sourceTree = "<group>"; };
 		CB30C12327D0ACF700FBE8DE /* NotificationService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NotificationService.entitlements; sourceTree = "<group>"; };
 		CB3C621327CE66540054F24C /* libEXSecureStore.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libEXSecureStore.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		CB8FC07A28291E2300AD5AEB /* ChangeSettingsMessageSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangeSettingsMessageSpec.h; sourceTree = "<group>"; };
+		CB8FC07B28291E2300AD5AEB /* DeleteEntryMessageSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeleteEntryMessageSpec.h; sourceTree = "<group>"; };
+		CB8FC07C28291E2300AD5AEB /* MultimediaMessageSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultimediaMessageSpec.h; sourceTree = "<group>"; };
+		CB8FC07D28291E2300AD5AEB /* CreateSidebarMessageSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CreateSidebarMessageSpec.h; sourceTree = "<group>"; };
+		CB8FC07E28291E2300AD5AEB /* TextMessageSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextMessageSpec.h; sourceTree = "<group>"; };
+		CB8FC07F28291E2300AD5AEB /* CreateSubThreadMessageSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CreateSubThreadMessageSpec.h; sourceTree = "<group>"; };
+		CB8FC08028291E2300AD5AEB /* UnsupportedMessageSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnsupportedMessageSpec.h; sourceTree = "<group>"; };
+		CB8FC08128291E2300AD5AEB /* ChangeRoleMessageSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChangeRoleMessageSpec.h; sourceTree = "<group>"; };
+		CB8FC08228291E2300AD5AEB /* CreateEntryMessageSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CreateEntryMessageSpec.h; sourceTree = "<group>"; };
+		CB8FC08328291E2300AD5AEB /* RestoreEntryMessageSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RestoreEntryMessageSpec.h; sourceTree = "<group>"; };
+		CB8FC08428291E2300AD5AEB /* MessageSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageSpec.h; sourceTree = "<group>"; };
+		CB8FC08528291E2400AD5AEB /* CreateThreadMessageSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CreateThreadMessageSpec.h; sourceTree = "<group>"; };
+		CB8FC08628291E2400AD5AEB /* UpdateRelationshipMessageSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UpdateRelationshipMessageSpec.h; sourceTree = "<group>"; };
+		CB8FC08728291E2400AD5AEB /* EditEntryMessageSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditEntryMessageSpec.h; sourceTree = "<group>"; };
+		CB8FC08828291E4100AD5AEB /* MessageOperationsUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MessageOperationsUtilities.cpp; sourceTree = "<group>"; };
+		CB8FC08928291E4100AD5AEB /* MessageOperationsUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageOperationsUtilities.h; sourceTree = "<group>"; };
+		CB8FC08A28291E4100AD5AEB /* MessageSpecs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageSpecs.h; sourceTree = "<group>"; };
 		F53DA7B3F26C2798DCE74A94 /* Pods-Comm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Comm.debug.xcconfig"; path = "Target Support Files/Pods-Comm/Pods-Comm.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -345,6 +364,7 @@
 		71BE843A2636A944002849D2 /* NativeModules */ = {
 			isa = PBXGroup;
 			children = (
+				CB8FC07828291C9F00AD5AEB /* MessageOperationsUtilities */,
 				726E5D722731A4240032361D /* InternalModules */,
 				71BE843C2636A944002849D2 /* CommCoreModule.cpp */,
 				71BE843E2636A944002849D2 /* CommCoreModule.h */,
@@ -491,6 +511,38 @@
 			name = ExpoModulesProviders;
 			sourceTree = "<group>";
 		};
+		CB8FC07828291C9F00AD5AEB /* MessageOperationsUtilities */ = {
+			isa = PBXGroup;
+			children = (
+				CB8FC08828291E4100AD5AEB /* MessageOperationsUtilities.cpp */,
+				CB8FC08928291E4100AD5AEB /* MessageOperationsUtilities.h */,
+				CB8FC08A28291E4100AD5AEB /* MessageSpecs.h */,
+				CB8FC07928291D4E00AD5AEB /* MessageSpecs */,
+			);
+			path = MessageOperationsUtilities;
+			sourceTree = "<group>";
+		};
+		CB8FC07928291D4E00AD5AEB /* MessageSpecs */ = {
+			isa = PBXGroup;
+			children = (
+				CB8FC08128291E2300AD5AEB /* ChangeRoleMessageSpec.h */,
+				CB8FC07A28291E2300AD5AEB /* ChangeSettingsMessageSpec.h */,
+				CB8FC08228291E2300AD5AEB /* CreateEntryMessageSpec.h */,
+				CB8FC07D28291E2300AD5AEB /* CreateSidebarMessageSpec.h */,
+				CB8FC07F28291E2300AD5AEB /* CreateSubThreadMessageSpec.h */,
+				CB8FC08528291E2400AD5AEB /* CreateThreadMessageSpec.h */,
+				CB8FC07B28291E2300AD5AEB /* DeleteEntryMessageSpec.h */,
+				CB8FC08728291E2400AD5AEB /* EditEntryMessageSpec.h */,
+				CB8FC08428291E2300AD5AEB /* MessageSpec.h */,
+				CB8FC07C28291E2300AD5AEB /* MultimediaMessageSpec.h */,
+				CB8FC08328291E2300AD5AEB /* RestoreEntryMessageSpec.h */,
+				CB8FC07E28291E2300AD5AEB /* TextMessageSpec.h */,
+				CB8FC08028291E2300AD5AEB /* UnsupportedMessageSpec.h */,
+				CB8FC08628291E2400AD5AEB /* UpdateRelationshipMessageSpec.h */,
+			);
+			path = MessageSpecs;
+			sourceTree = "<group>";
+		};
 		D533B93718E3B9684B508006 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -846,6 +898,7 @@
 				726E5D752731A4790032361D /* NetworkModule.cpp in Sources */,
 				71BF5B7526B401D300EDE27D /* Tools.cpp in Sources */,
 				13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
+				CB8FC08B28291E4100AD5AEB /* MessageOperationsUtilities.cpp in Sources */,
 				71142A7726C2650B0039DCBD /* CommSecureStoreIOSWrapper.mm in Sources */,
 				71BE84492636A944002849D2 /* NativeModules.cpp in Sources */,
 				71CA4A64262DA8E500835C89 /* Logger.mm in Sources */,
@@ -872,6 +925,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CB8FC08C28291F3A00AD5AEB /* MessageOperationsUtilities.cpp in Sources */,
 				CB1648AF27CFBE6A00394D9D /* CryptoModule.cpp in Sources */,
 				CB1648AD27CFBBBB00394D9D /* ClientGetReadReactor.cpp in Sources */,
 				CB4821B227CFB20E001AB7E1 /* SQLiteQueryExecutor.cpp in Sources */,
@@ -1115,7 +1169,11 @@
 					"-DSQLITE_TEMP_STORE=2",
 					"-DSQLCIPHER_CRYPTO_OPENSSL",
 				);
-				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-DFOLLY_MOBILE=1",
+					"-DFOLLY_USE_LIBCPP=1",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = app.comm.NotificationService;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = NO;
@@ -1163,6 +1221,11 @@
 					"-DSQLITE_TEMP_STORE=2",
 					"-DSQLCIPHER_CRYPTO_OPENSSL",
 				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-DFOLLY_MOBILE=1",
+					"-DFOLLY_USE_LIBCPP=1",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = app.comm.NotificationService;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = NO;