diff --git a/native/android/app/CMakeLists.txt b/native/android/app/CMakeLists.txt
index dfb0f7511..209cc7c3f 100644
--- a/native/android/app/CMakeLists.txt
+++ b/native/android/app/CMakeLists.txt
@@ -1,196 +1,200 @@
 # For more information about using CMake with Android Studio, read the
 # documentation: https://d.android.com/studio/projects/add-native-code.html
 project(comm)
 
 set (CMAKE_CXX_STANDARD 14)
 
 # Sets the minimum version of CMake required to build the native library.
 
 cmake_minimum_required(VERSION 3.4.1)
 
 # Creates and names a library, sets it as either STATIC
 # or SHARED, and provides the relative paths to its source code.
 # You can define multiple libraries, and CMake builds them for you.
 # Gradle automatically packages shared libraries with your APK.
 
 set(PACKAGE_NAME "comm_jni_module")
 
 find_package(fbjni REQUIRED CONFIG)
 
 set(BUILD_TESTING OFF)
 set(HAVE_SYMBOLIZE OFF)
 set(WITH_GTEST OFF CACHE BOOL "Use googletest" FORCE)
 set(WITH_GFLAGS OFF CACHE BOOL "Use gflags" FORCE)
 
 # Protobuf
 set(protobuf_BUILD_TESTS OFF)
 
 # gRPC building parameters
 set(gRPC_BUILD_CSHARP_EXT OFF)
 set(gRPC_SSL_PROVIDER "package" CACHE STRING "SSL library provider")
 # Disable unused plugins
 set(gRPC_BUILD_GRPC_PHP_PLUGIN OFF)
 set(gRPC_BUILD_GRPC_RUBY_PLUGIN OFF)
 set(gRPC_BUILD_GRPC_PYTHON_PLUGIN OFF)
 set(gRPC_BUILD_GRPC_CSHARP_PLUGIN OFF)
 # We're updating parameters below for Cmake's find_OpenSSL() function
 set(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/build/third-party-ndk/openssl/openssl-${OPENSSL_VERSION}/build/${CMAKE_ANDROID_ARCH_ABI}")
 list(APPEND CMAKE_FIND_ROOT_PATH "${OPENSSL_ROOT_DIR}")
 
 add_subdirectory(./build/third-party-ndk/grpc/grpc-${GRPC_VERSION}/ ${CMAKE_CURRENT_BINARY_DIR}/grpc/ EXCLUDE_FROM_ALL)
 add_subdirectory(./build/third-party-ndk/glog/glog-${GLOG_VERSION}/)
 add_subdirectory(../../node_modules/olm ./build)
 
 include_directories(
   ../../node_modules/react-native/React
   ../../node_modules/react-native/React/Base
   ../../node_modules/react-native/ReactCommon
   ../../node_modules/react-native/ReactCommon/jsi
   ../../node_modules/react-native/ReactCommon/callinvoker
   ../../node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon
 
   # OpenSSL
   ./build/third-party-ndk/openssl/openssl-${OPENSSL_VERSION}/build/${CMAKE_ANDROID_ARCH_ABI}/include
 
   # SQLCipher amalgamation
   ../../node_modules/@commapp/sqlcipher-amalgamation/src
 
   # SQLite ORM
   ../../cpp/lib/sqlite_orm
 
   # symlinked React Native headers
   ../headers
 
   # external libs
   ./build/third-party-ndk/folly
   ./build/third-party-ndk/boost/boost
   ./build/third-party-ndk/double-conversion
 
   # comm android specific code
   ./src/cpp
 
   # comm native mutual code
   ../../cpp/CommonCpp/NativeModules
   ../../cpp/CommonCpp/NativeModules/InternalModules
+  ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities
+  ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/ThreadOperationsUtilities
   ../../cpp/CommonCpp/DatabaseManagers
   ../../cpp/CommonCpp/Tools
   ../../cpp/CommonCpp/grpc/_generated
   ../../cpp/CommonCpp/grpc
 )
 
 # search for all cpp files in this directory
 file(GLOB SQLCIPHER "../../node_modules/@commapp/sqlcipher-amalgamation/src/*.c")
-file(GLOB COMMON_NATIVE_CODE "../../cpp/CommonCpp/**/*.cpp")
-file(GLOB COMMON_NATIVE_INTERNAL "../../cpp/CommonCpp/**/**/*.cpp")
+file(GLOB_RECURSE COMMON_NATIVE_CODE "../../cpp/CommonCpp/**/*.cpp")
 file(GLOB ANDROID_NATIVE_CODE "./src/cpp/*.cpp")
 file(GLOB DOUBLE_CONVERSION_SOURCES "./build/third-party-ndk/double-conversion/double-conversion/*.cc")
 file(GLOB GRPC_CODE "../../cpp/CommonCpp/grpc/_generated/*.cc")
 
 add_library(
   # Sets the name of the library.
   ${PACKAGE_NAME}
 
   # Sets the library as a shared library.
   SHARED
 
   # Provides a relative path to your source file(s).
   ../../node_modules/react-native/ReactCommon/jsi/jsi/jsi.cpp
   ../../node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.cpp
   ../../node_modules/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.cpp
   ../../node_modules/react-native/ReactCommon/react/nativemodule/core/ReactCommon/LongLivedObject.cpp
   ../../node_modules/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.cpp
   
   # SQLCipher
   ${SQLCIPHER}
 
   # folly
   ./build/third-party-ndk/folly/folly/detail/Futex.cpp
   ./build/third-party-ndk/folly/folly/synchronization/ParkingLot.cpp
   ./build/third-party-ndk/folly/folly/lang/SafeAssert.cpp
   ./build/third-party-ndk/folly/folly/FileUtil.cpp
   ./build/third-party-ndk/folly/folly/Subprocess.cpp
   ./build/third-party-ndk/folly/folly/File.cpp
   ./build/third-party-ndk/folly/folly/Format.cpp
   ./build/third-party-ndk/folly/folly/Conv.cpp
   ./build/third-party-ndk/folly/folly/io/IOBuf.cpp
   ./build/third-party-ndk/folly/folly/memory/detail/MallocImpl.cpp
   ./build/third-party-ndk/folly/folly/ScopeGuard.cpp
   ./build/third-party-ndk/folly/folly/hash/SpookyHashV2.cpp
   ./build/third-party-ndk/folly/folly/io/IOBufQueue.cpp
   ./build/third-party-ndk/folly/folly/lang/Assume.cpp
   ./build/third-party-ndk/folly/folly/String.cpp
   ./build/third-party-ndk/folly/folly/portability/SysUio.cpp
   ./build/third-party-ndk/folly/folly/net/NetOps.cpp
+  ./build/third-party-ndk/folly/folly/dynamic.cpp
+  ./build/third-party-ndk/folly/folly/json.cpp
+  ./build/third-party-ndk/folly/folly/json_pointer.cpp
+  ./build/third-party-ndk/folly/folly/Unicode.cpp
 
   # double-conversion
   ${DOUBLE_CONVERSION_SOURCES}
 
   ${GRPC_CODE}
 
   # comm code
   ${ANDROID_NATIVE_CODE}
   ${COMMON_NATIVE_CODE}
-  ${COMMON_NATIVE_INTERNAL}
 )
 
 add_definitions(
   ## Folly
   -DFOLLY_NO_CONFIG=1
   -DFOLLY_HAVE_CLOCK_GETTIME=1
   -DFOLLY_HAVE_MEMRCHR=1
   -DFOLLY_USE_LIBCPP=1
   -DFOLLY_MOBILE=1
 
   ## SQLCipher
   -DSQLITE_THREADSAFE=0
   -DSQLITE_HAS_CODEC
   -DSQLITE_TEMP_STORE=2
   -DSQLCIPHER_CRYPTO_OPENSSL
 )
 
 find_library(log-lib log)
 
 add_library(
     # OpenSSL Crypto lib
     openssl-crypto
     STATIC
     IMPORTED
 )
 set_target_properties(
     # OpenSSL Crypto lib
     openssl-crypto
     PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/build/third-party-ndk/openssl/openssl-${OPENSSL_VERSION}/build/${CMAKE_ANDROID_ARCH_ABI}/lib/libcrypto.a"
 )
 add_library(
     # OpenSSL SSL lib
     openssl-ssl
     STATIC
     IMPORTED
 )
 set_target_properties(
     # OpenSSL SSL lib
     openssl-ssl
     PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/build/third-party-ndk/openssl/openssl-${OPENSSL_VERSION}/build/${CMAKE_ANDROID_ARCH_ABI}/lib/libssl.a"
 )
 
 target_link_libraries(
   ${PACKAGE_NAME}
   fbjni::fbjni
   android
   ${log-lib}
   glog::glog
   olm
   openssl-crypto
   openssl-ssl
   grpc++
   libprotobuf
 )
 
 # add a dummy library which is required by CallInvokerHolderImpl.java
 add_library(
   turbomodulejsijni
   # Sets the library as a shared library.
   SHARED
   # Provides a relative path to your source file(s).
   ./src/cpp/dummy.cpp
 )
diff --git a/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/ThreadOperationsUtilities/ThreadOperations.cpp b/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/ThreadOperationsUtilities/ThreadOperations.cpp
new file mode 100644
index 000000000..8a218ee57
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/ThreadOperationsUtilities/ThreadOperations.cpp
@@ -0,0 +1,39 @@
+#include "ThreadOperations.h"
+#include "../../../DatabaseManagers/DatabaseManager.h"
+#include "Logger.h"
+#include <folly/String.h>
+#include <folly/json.h>
+#include <stdexcept>
+
+namespace comm {
+void ThreadOperations::updateSQLiteUnreadStatus(
+    std::string &threadID,
+    bool unread) {
+  std::unique_ptr<Thread> thread =
+      DatabaseManager::getQueryExecutor().getThread(threadID);
+  if (thread == nullptr) {
+    throw std::runtime_error(
+        "Attempted to update non-existing thread with ID:  " + threadID);
+  }
+  folly::dynamic updatedCurrentUser;
+  try {
+    updatedCurrentUser = folly::parseJson(thread->current_user);
+  } catch (const folly::json::parse_error &e) {
+    Logger::log(
+        "Invalid json structure of current_user field of thread of id: " +
+        threadID + ". Details: " + std::string(e.what()));
+    return;
+  }
+  updatedCurrentUser["unread"] = unread;
+  try {
+    thread->current_user = folly::toJson(updatedCurrentUser);
+  } catch (const folly::json::parse_error &e) {
+    Logger::log(
+        "Failed to serialize updated current_user JSON object. Details: " +
+        std::string(e.what()));
+    return;
+  }
+
+  DatabaseManager::getQueryExecutor().replaceThread(*thread);
+}
+} // namespace comm
diff --git a/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/ThreadOperationsUtilities/ThreadOperations.h b/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/ThreadOperationsUtilities/ThreadOperations.h
new file mode 100644
index 000000000..bf72aa202
--- /dev/null
+++ b/native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/ThreadOperationsUtilities/ThreadOperations.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "../../../DatabaseManagers/entities/Thread.h"
+
+#include <string>
+
+namespace comm {
+class ThreadOperations {
+public:
+  static void updateSQLiteUnreadStatus(std::string &threadID, bool unread);
+};
+} // namespace comm