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
@@ -62,7 +62,13 @@
 		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 */; };
+		CB5E81132869A1C7002C9BCD /* TemporalMessageStorage.mm in Sources */ = {isa = PBXBuildFile; fileRef = CB5E81122869A1C7002C9BCD /* TemporalMessageStorage.mm */; };
+		CB5E81162869A33D002C9BCD /* EncryptedFileUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = CB5E81142869A33D002C9BCD /* EncryptedFileUtils.mm */; };
+		CB5E81172869BF28002C9BCD /* EncryptedFileUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = CB5E81142869A33D002C9BCD /* EncryptedFileUtils.mm */; };
+		CB5E81182869BF28002C9BCD /* TemporalMessageStorage.mm in Sources */ = {isa = PBXBuildFile; fileRef = CB5E81122869A1C7002C9BCD /* TemporalMessageStorage.mm */; };
 		CB64AA76284F4DC900460699 /* ThreadOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CB64AA74284F4DC900460699 /* ThreadOperations.cpp */; };
+		CB892652286B186000E7F3DD /* NonBlockingLock.mm in Sources */ = {isa = PBXBuildFile; fileRef = CB892651286B186000E7F3DD /* NonBlockingLock.mm */; };
+		CB892653286B281A00E7F3DD /* NonBlockingLock.mm in Sources */ = {isa = PBXBuildFile; fileRef = CB892651286B186000E7F3DD /* NonBlockingLock.mm */; };
 		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 */
@@ -206,8 +212,14 @@
 		CB38F2BE286C6C980010535C /* DeleteEntryMessageSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DeleteEntryMessageSpec.h; path = PersistentStorageUtilities/MessageOperationsUtilities/MessageSpecs/DeleteEntryMessageSpec.h; sourceTree = "<group>"; };
 		CB38F2BF286C6C980010535C /* UpdateRelationshipMessageSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UpdateRelationshipMessageSpec.h; path = PersistentStorageUtilities/MessageOperationsUtilities/MessageSpecs/UpdateRelationshipMessageSpec.h; sourceTree = "<group>"; };
 		CB3C621327CE66540054F24C /* libEXSecureStore.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libEXSecureStore.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		CB5E81112869A1C7002C9BCD /* TemporalMessageStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TemporalMessageStorage.h; path = Comm/TemporalMessageStorage/TemporalMessageStorage.h; sourceTree = "<group>"; };
+		CB5E81122869A1C7002C9BCD /* TemporalMessageStorage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TemporalMessageStorage.mm; path = Comm/TemporalMessageStorage/TemporalMessageStorage.mm; sourceTree = "<group>"; };
+		CB5E81142869A33D002C9BCD /* EncryptedFileUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = EncryptedFileUtils.mm; path = Comm/TemporalMessageStorage/EncryptedFileUtils.mm; sourceTree = "<group>"; };
+		CB5E81152869A33D002C9BCD /* EncryptedFileUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EncryptedFileUtils.h; path = Comm/TemporalMessageStorage/EncryptedFileUtils.h; sourceTree = "<group>"; };
 		CB64AA74284F4DC900460699 /* ThreadOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadOperations.cpp; path = ../PersistentStorageUtilities/ThreadOperationsUtilities/ThreadOperations.cpp; sourceTree = "<group>"; };
 		CB64AA75284F4DC900460699 /* ThreadOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadOperations.h; path = ../PersistentStorageUtilities/ThreadOperationsUtilities/ThreadOperations.h; sourceTree = "<group>"; };
+		CB892650286B185F00E7F3DD /* NonBlockingLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NonBlockingLock.h; path = Comm/TemporalMessageStorage/NonBlockingLock.h; sourceTree = "<group>"; };
+		CB892651286B186000E7F3DD /* NonBlockingLock.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NonBlockingLock.mm; path = Comm/TemporalMessageStorage/NonBlockingLock.mm; 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 */
 
@@ -318,6 +330,7 @@
 		71B8CCB626BD30EC0040C0A2 /* CommCoreImplementations */ = {
 			isa = PBXGroup;
 			children = (
+				CB5E81102869A19C002C9BCD /* TemporalMessageStorage */,
 				71762A74270D8AAE00F565ED /* PlatformSpecificTools.mm */,
 				71D4D7CB26C50B1000FCDBCD /* CommSecureStore.mm */,
 				71142A7526C2650A0039DCBD /* CommSecureStoreIOSWrapper.h */,
@@ -544,6 +557,17 @@
 				CB38F2BF286C6C980010535C /* UpdateRelationshipMessageSpec.h */,
 			);
 			name = MessageSpecs;
+		CB5E81102869A19C002C9BCD /* TemporalMessageStorage */ = {
+			isa = PBXGroup;
+			children = (
+				CB892650286B185F00E7F3DD /* NonBlockingLock.h */,
+				CB892651286B186000E7F3DD /* NonBlockingLock.mm */,
+				CB5E81152869A33D002C9BCD /* EncryptedFileUtils.h */,
+				CB5E81142869A33D002C9BCD /* EncryptedFileUtils.mm */,
+				CB5E81112869A1C7002C9BCD /* TemporalMessageStorage.h */,
+				CB5E81122869A1C7002C9BCD /* TemporalMessageStorage.mm */,
+			);
+			name = TemporalMessageStorage;
 			sourceTree = "<group>";
 		};
 		CB64AA73284F4D4C00460699 /* ThreadOperationsUtilities */ = {
@@ -913,8 +937,10 @@
 				718DE99E2653D41C00365824 /* WorkerThread.cpp in Sources */,
 				71CA4AEC262F236100835C89 /* Tools.mm in Sources */,
 				71009A7B26FDCD72002C8453 /* Client.cpp in Sources */,
+				CB892652286B186000E7F3DD /* NonBlockingLock.mm in Sources */,
 				71762A75270D8AAE00F565ED /* PlatformSpecificTools.mm in Sources */,
 				71BF5B7126B3FF0900EDE27D /* Session.cpp in Sources */,
+				CB5E81132869A1C7002C9BCD /* TemporalMessageStorage.mm in Sources */,
 				71009A7726FDCA67002C8453 /* tunnelbroker.pb.cc in Sources */,
 				726E5D752731A4790032361D /* NetworkModule.cpp in Sources */,
 				71BF5B7526B401D300EDE27D /* Tools.cpp in Sources */,
@@ -927,6 +953,7 @@
 				71BE844A2636A944002849D2 /* CommCoreModule.cpp in Sources */,
 				71D4D7CC26C50B1000FCDBCD /* CommSecureStore.mm in Sources */,
 				CB64AA76284F4DC900460699 /* ThreadOperations.cpp in Sources */,
+				CB5E81162869A33D002C9BCD /* EncryptedFileUtils.mm in Sources */,
 				711B408425DA97F9005F8F06 /* dummy.swift in Sources */,
 				726E5D782731A5E10032361D /* GlobalNetworkSingleton.cpp in Sources */,
 				13B07FC11A68108700A75B9A /* main.m in Sources */,
@@ -948,6 +975,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				CB38F2C0286C6CDF0010535C /* MessageOperationsUtilities.cpp in Sources */,
+				CB892653286B281A00E7F3DD /* NonBlockingLock.mm in Sources */,
+				CB5E81172869BF28002C9BCD /* EncryptedFileUtils.mm in Sources */,
+				CB5E81182869BF28002C9BCD /* TemporalMessageStorage.mm in Sources */,
 				CB1648AF27CFBE6A00394D9D /* CryptoModule.cpp in Sources */,
 				CB1648AD27CFBBBB00394D9D /* ClientGetReadReactor.cpp in Sources */,
 				CB4821B227CFB20E001AB7E1 /* SQLiteQueryExecutor.cpp in Sources */,