diff --git a/lib/types/sqlite-types.js b/lib/types/sqlite-types.js
index 7554ded19..d2f9a1adb 100644
--- a/lib/types/sqlite-types.js
+++ b/lib/types/sqlite-types.js
@@ -1,33 +1,42 @@
 // @flow
 
 import type { StoreOperations } from './store-ops-types.js';
 
 export type InboundP2PMessage = {
   +messageID: string,
   +senderDeviceID: string,
   +plaintext: string,
   +status: string,
 };
 
 export type OutboundP2PMessage = {
   +messageID: string,
   +deviceID: string,
   +userID: string,
   +timestamp: string,
   +plaintext: string,
   +ciphertext: string,
   +status: string,
 };
 
 export type SQLiteAPI = {
   // read operations
   +getAllInboundP2PMessage: () => Promise<InboundP2PMessage[]>,
+  +getAllOutboundP2PMessage: () => Promise<OutboundP2PMessage[]>,
 
   // write operations
   +removeInboundP2PMessages: (ids: $ReadOnlyArray<string>) => Promise<void>,
+  +markOutboundP2PMessageAsSent: (
+    messageID: string,
+    deviceID: string,
+  ) => Promise<void>,
+  +removeOutboundP2PMessagesOlderThan: (
+    messageID: string,
+    deviceID: string,
+  ) => Promise<void>,
 
   +processDBStoreOperations: (
     operations: StoreOperations,
     userID?: ?string,
   ) => Promise<void>,
 };
diff --git a/lib/utils/__mocks__/config.js b/lib/utils/__mocks__/config.js
index 6bcbb3837..d05b74070 100644
--- a/lib/utils/__mocks__/config.js
+++ b/lib/utils/__mocks__/config.js
@@ -1,38 +1,41 @@
 // @flow
 
 import { type Config } from '../config.js';
 
 const getConfig = (): Config => ({
   resolveKeyserverSessionInvalidationUsingNativeCredentials: null,
   setSessionIDOnRequest: true,
   calendarRangeInactivityLimit: null,
   platformDetails: {
     platform: 'web',
     codeVersion: 70,
     stateVersion: 50,
   },
   authoritativeKeyserverID: '123',
   olmAPI: {
     initializeCryptoAccount: jest.fn(),
     getUserPublicKey: jest.fn(),
     encrypt: jest.fn(),
     decrypt: jest.fn(),
     decryptSequentialAndPersist: jest.fn(),
     contentInboundSessionCreator: jest.fn(),
     contentOutboundSessionCreator: jest.fn(),
     notificationsSessionCreator: jest.fn(),
     getOneTimeKeys: jest.fn(),
     validateAndUploadPrekeys: jest.fn(),
     signMessage: jest.fn(),
     verifyMessage: jest.fn(),
   },
   sqliteAPI: {
     getAllInboundP2PMessage: jest.fn(),
     removeInboundP2PMessages: jest.fn(),
     processDBStoreOperations: jest.fn(),
+    getAllOutboundP2PMessage: jest.fn(),
+    markOutboundP2PMessageAsSent: jest.fn(),
+    removeOutboundP2PMessagesOlderThan: jest.fn(),
   },
 });
 
 const hasConfig = (): boolean => true;
 
 export { getConfig, hasConfig };
diff --git a/native/database/sqlite-api.js b/native/database/sqlite-api.js
index d035918b0..0819a7951 100644
--- a/native/database/sqlite-api.js
+++ b/native/database/sqlite-api.js
@@ -1,18 +1,22 @@
 // @flow
 
 import type { SQLiteAPI } from 'lib/types/sqlite-types.js';
 
 import { commCoreModule } from '../native-modules.js';
 import { processDBStoreOperations } from '../redux/redux-utils.js';
 
 const sqliteAPI: SQLiteAPI = {
   // read operations
   getAllInboundP2PMessage: commCoreModule.getAllInboundP2PMessage,
+  getAllOutboundP2PMessage: commCoreModule.getAllOutboundP2PMessage,
 
   // write operations
   removeInboundP2PMessages: commCoreModule.removeInboundP2PMessages,
+  markOutboundP2PMessageAsSent: commCoreModule.markOutboundP2PMessageAsSent,
+  removeOutboundP2PMessagesOlderThan:
+    commCoreModule.removeOutboundP2PMessagesOlderThan,
 
   processDBStoreOperations,
 };
 
 export { sqliteAPI };
diff --git a/web/database/sqlite-api.js b/web/database/sqlite-api.js
index 20b7dce98..432b554bc 100644
--- a/web/database/sqlite-api.js
+++ b/web/database/sqlite-api.js
@@ -1,35 +1,76 @@
 // @flow
 
-import type { SQLiteAPI, InboundP2PMessage } from 'lib/types/sqlite-types.js';
+import type {
+  SQLiteAPI,
+  InboundP2PMessage,
+  OutboundP2PMessage,
+} from 'lib/types/sqlite-types.js';
 
 import { getCommSharedWorker } from '../shared-worker/shared-worker-provider.js';
 import { processDBStoreOperations } from '../shared-worker/utils/store.js';
 import { workerRequestMessageTypes } from '../types/worker-types.js';
 
 const sqliteAPI: SQLiteAPI = {
   // read operations
   async getAllInboundP2PMessage(): Promise<InboundP2PMessage[]> {
     const sharedWorker = await getCommSharedWorker();
 
     const data = await sharedWorker.schedule({
       type: workerRequestMessageTypes.GET_INBOUND_P2P_MESSAGES,
     });
     const messages: ?$ReadOnlyArray<InboundP2PMessage> =
       data?.inboundP2PMessages;
     return messages ? [...messages] : [];
   },
 
+  async getAllOutboundP2PMessage(): Promise<OutboundP2PMessage[]> {
+    const sharedWorker = await getCommSharedWorker();
+
+    const data = await sharedWorker.schedule({
+      type: workerRequestMessageTypes.GET_OUTBOUND_P2P_MESSAGES,
+    });
+    const messages: ?$ReadOnlyArray<OutboundP2PMessage> =
+      data?.outboundP2PMessages;
+    return messages ? [...messages] : [];
+  },
+
   // write operations
   async removeInboundP2PMessages(ids: $ReadOnlyArray<string>): Promise<void> {
     const sharedWorker = await getCommSharedWorker();
 
     await sharedWorker.schedule({
       type: workerRequestMessageTypes.REMOVE_INBOUND_P2P_MESSAGES,
       ids,
     });
   },
 
+  async markOutboundP2PMessageAsSent(
+    messageID: string,
+    deviceID: string,
+  ): Promise<void> {
+    const sharedWorker = await getCommSharedWorker();
+
+    await sharedWorker.schedule({
+      type: workerRequestMessageTypes.MARK_OUTBOUND_P2P_MESSAGE_AS_SENT,
+      messageID,
+      deviceID,
+    });
+  },
+
+  async removeOutboundP2PMessagesOlderThan(
+    messageID: string,
+    deviceID: string,
+  ): Promise<void> {
+    const sharedWorker = await getCommSharedWorker();
+
+    await sharedWorker.schedule({
+      type: workerRequestMessageTypes.REMOVE_OUTBOUND_P2P_MESSAGES,
+      messageID,
+      deviceID,
+    });
+  },
+
   processDBStoreOperations,
 };
 
 export { sqliteAPI };