diff --git a/lib/handlers/peer-to-peer-message-handler.js b/lib/handlers/peer-to-peer-message-handler.js
index 47c973139..953768d50 100644
--- a/lib/handlers/peer-to-peer-message-handler.js
+++ b/lib/handlers/peer-to-peer-message-handler.js
@@ -1,168 +1,187 @@
 // @flow
 
 import _isEqual from 'lodash/fp/isEqual.js';
 
 import { verifyAndGetDeviceList } from '../shared/device-list-utils.js';
 import type {
   IdentityServiceClient,
   DeviceOlmInboundKeys,
 } from '../types/identity-service-types.js';
 import {
   peerToPeerMessageTypes,
   type PeerToPeerMessage,
 } from '../types/tunnelbroker/peer-to-peer-message-types.js';
 import { getConfig } from '../utils/config.js';
 import { getContentSigningKey } from '../utils/crypto-utils.js';
+import { getMessageForException } from '../utils/errors.js';
 import { hasHigherDeviceID, olmSessionErrors } from '../utils/olm-utils.js';
+import { getClientMessageIDFromTunnelbrokerMessageID } from '../utils/peer-to-peer-communication-utils.js';
 
 async function peerToPeerMessageHandler(
   message: PeerToPeerMessage,
   identityClient: IdentityServiceClient,
   messageID: string,
 ): Promise<void> {
-  const { olmAPI } = getConfig();
+  const { olmAPI, sqliteAPI } = getConfig();
   if (message.type === peerToPeerMessageTypes.OUTBOUND_SESSION_CREATION) {
     const { senderInfo, encryptedData, sessionVersion } = message;
     const { userID: senderUserID, deviceID: senderDeviceID } = senderInfo;
 
     let deviceKeys: ?DeviceOlmInboundKeys = null;
     try {
       const { keys } = await identityClient.getInboundKeysForUser(senderUserID);
       deviceKeys = keys[senderDeviceID];
     } catch (e) {
       console.log(e.message);
     }
 
     if (!deviceKeys) {
       console.log(
         'Error creating inbound session with device ' +
           `${senderDeviceID}: No keys for the device, ` +
           `session version: ${sessionVersion}`,
       );
       return;
     }
 
     try {
       await olmAPI.initializeCryptoAccount();
       const result = await olmAPI.contentInboundSessionCreator(
         deviceKeys.identityKeysBlob.primaryIdentityPublicKeys,
         encryptedData,
         sessionVersion,
         false,
       );
       console.log(
         'Created inbound session with device ' +
           `${senderDeviceID}: ${result}, ` +
           `session version: ${sessionVersion}`,
       );
     } catch (e) {
       if (e.message?.includes(olmSessionErrors.alreadyCreated)) {
         console.log(
           'Received session request with lower session version from ' +
             `${senderDeviceID}, session version: ${sessionVersion}`,
         );
       } else if (e.message?.includes(olmSessionErrors.raceCondition)) {
         const currentDeviceID = await getContentSigningKey();
         if (hasHigherDeviceID(currentDeviceID, senderDeviceID)) {
           console.log(
             'Race condition while creating session with ' +
               `${senderDeviceID}, session version: ${sessionVersion}, ` +
               `this device has a higher deviceID and the session will be kept`,
           );
         } else {
           const result = await olmAPI.contentInboundSessionCreator(
             deviceKeys.identityKeysBlob.primaryIdentityPublicKeys,
             encryptedData,
             sessionVersion,
             true,
           );
           console.log(
             'Overwrite session with device ' +
               `${senderDeviceID}: ${result}, ` +
               `session version: ${sessionVersion}`,
           );
           // Resend all not-yet confirmed messages that were encrypted
           // with overwrite session. Tracked in ENG-6982.
         }
       } else {
         console.log(
           'Error creating inbound session with device ' +
             `${senderDeviceID}: ${e.message}, ` +
             `session version: ${sessionVersion}`,
         );
       }
     }
   } else if (message.type === peerToPeerMessageTypes.ENCRYPTED_MESSAGE) {
     try {
       await olmAPI.initializeCryptoAccount();
       const decrypted = await olmAPI.decryptSequentialAndPersist(
         message.encryptedData,
         message.senderInfo.deviceID,
         messageID,
       );
       console.log(
         'Decrypted message from device ' +
           `${message.senderInfo.deviceID}: ${decrypted}`,
       );
     } catch (e) {
       if (e.message?.includes(olmSessionErrors.messageAlreadyDecrypted)) {
         console.log(
           'Received already decrypted message from device ' +
             `${message.senderInfo.deviceID}.`,
         );
       } else if (e.message?.includes(olmSessionErrors.messageOutOfOrder)) {
         console.log(
           'Received out-of-order message from device ' +
             `${message.senderInfo.deviceID}.`,
         );
       } else {
         console.log(
           'Error decrypting message from device ' +
             `${message.senderInfo.deviceID}: ${e.message}`,
         );
       }
     }
   } else if (message.type === peerToPeerMessageTypes.REFRESH_KEY_REQUEST) {
     try {
       await olmAPI.initializeCryptoAccount();
       const oneTimeKeys = await olmAPI.getOneTimeKeys(message.numberOfKeys);
       await identityClient.uploadOneTimeKeys(oneTimeKeys);
     } catch (e) {
       console.log(`Error uploading one-time keys: ${e.message}`);
     }
   } else if (message.type === peerToPeerMessageTypes.DEVICE_LIST_UPDATED) {
     try {
       const result = await verifyAndGetDeviceList(
         identityClient,
         message.userID,
         null,
       );
       if (result.valid) {
         console.log(
           `Received valid device list update for user ${message.userID}`,
         );
         const receivedRawList = JSON.parse(
           message.signedDeviceList.rawDeviceList,
         );
 
         // additional check for broadcasted and Identity device list equality
         const listsAreEqual = _isEqual(result.deviceList)(receivedRawList);
         console.log(
           `Identity and received device lists are ${
             listsAreEqual ? '' : 'not'
           } equal.`,
         );
       } else {
         console.log(
           `Received invalid device list update for user ${message.userID}. Reason: ${result.reason}`,
         );
       }
     } catch (e) {
       console.log(
         `Error verifying device list for user ${message.userID}: ${e}`,
       );
     }
+  } else if (message.type === peerToPeerMessageTypes.MESSAGE_PROCESSED) {
+    try {
+      const { deviceID, messageID: tunnelbrokerMessageID } = message;
+      const clientMessageID = getClientMessageIDFromTunnelbrokerMessageID(
+        tunnelbrokerMessageID,
+      );
+      await sqliteAPI.removeOutboundP2PMessagesOlderThan(
+        clientMessageID,
+        deviceID,
+      );
+    } catch (e) {
+      console.log(
+        `Error removing message after processing: ${
+          getMessageForException(e) ?? 'unknown error'
+        }`,
+      );
+    }
   }
 }
 
 export { peerToPeerMessageHandler };
diff --git a/lib/utils/peer-to-peer-communication-utils.js b/lib/utils/peer-to-peer-communication-utils.js
new file mode 100644
index 000000000..ff271079f
--- /dev/null
+++ b/lib/utils/peer-to-peer-communication-utils.js
@@ -0,0 +1,13 @@
+// @flow
+
+function getClientMessageIDFromTunnelbrokerMessageID(
+  tunnelbrokerMessageID: string,
+): string {
+  const ids = tunnelbrokerMessageID.split('#');
+  if (ids.length !== 2) {
+    throw new Error('Invalid tunnelbrokerMessageID');
+  }
+  return ids[1];
+}
+
+export { getClientMessageIDFromTunnelbrokerMessageID };