diff --git a/james-project b/james-project
index ecbfe49af8..b2544721c0 160000
--- a/james-project
+++ b/james-project
@@ -1 +1 @@
-Subproject commit ecbfe49af84ea6b3d6acf6abdab32c877ceb932e
+Subproject commit b2544721c076f94d472ae64e11dc99712768e572
diff --git a/tmail-backend/jmap/extensions/src/test/java/com/linagora/tmail/james/jmap/event/KeywordEmailQueryViewListenerTest.java b/tmail-backend/jmap/extensions/src/test/java/com/linagora/tmail/james/jmap/event/KeywordEmailQueryViewListenerTest.java
index 2a6de283f0..268cb9bb2e 100644
--- a/tmail-backend/jmap/extensions/src/test/java/com/linagora/tmail/james/jmap/event/KeywordEmailQueryViewListenerTest.java
+++ b/tmail-backend/jmap/extensions/src/test/java/com/linagora/tmail/james/jmap/event/KeywordEmailQueryViewListenerTest.java
@@ -761,7 +761,7 @@ void shouldDeleteConcernedKeywords() throws Exception {
                 assertThat(messageIdsByKeywordView(OWNER, USER_NEW_KEYWORD)).containsExactly(messageId);
             });
 
-            MailboxEvents.MessageContentDeletionEvent event = new MailboxEvents.MessageContentDeletionEvent(Event.EventId.random(), OWNER, mailboxId, messageId, 12L,
+            MailboxEvents.MessageContentDeletionEvent event = new MailboxEvents.MessageContentDeletionEvent(Event.EventId.random(), OWNER, mailboxId, MailboxACL.EMPTY, messageId, 12L,
                 INTERNAL_DATE, asFlags(List.of(Flags.Flag.FLAGGED), USER_NEW_KEYWORD), false, Optional.empty(), Optional.empty(), "bodyBlobId",
                 Optional.empty());
 
diff --git a/tmail-backend/mailbox/plugin/tmail-deleted-message-vault/common/src/main/java/com/linagora/tmail/vault/TeamMailboxDeletedMessageVaultDeletionListener.java b/tmail-backend/mailbox/plugin/tmail-deleted-message-vault/common/src/main/java/com/linagora/tmail/vault/TeamMailboxDeletedMessageVaultDeletionListener.java
index a0926aa5db..a030bbb365 100644
--- a/tmail-backend/mailbox/plugin/tmail-deleted-message-vault/common/src/main/java/com/linagora/tmail/vault/TeamMailboxDeletedMessageVaultDeletionListener.java
+++ b/tmail-backend/mailbox/plugin/tmail-deleted-message-vault/common/src/main/java/com/linagora/tmail/vault/TeamMailboxDeletedMessageVaultDeletionListener.java
@@ -26,6 +26,8 @@
 import org.apache.james.blob.api.BlobId;
 import org.apache.james.blob.api.BlobStore;
 import org.apache.james.core.Username;
+import org.apache.james.mailbox.MessageIdManager;
+import org.apache.james.mailbox.SessionProvider;
 import org.apache.james.mailbox.events.MailboxEvents.MessageContentDeletionEvent;
 import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.vault.DeletedMessageVault;
@@ -52,8 +54,10 @@ public class TeamMailboxDeletedMessageVaultDeletionListener extends DeletedMessa
     public TeamMailboxDeletedMessageVaultDeletionListener(BlobId.Factory blobIdFactory,
                                                           DeletedMessageVault deletedMessageVault,
                                                           BlobStore blobStore,
-                                                          Clock clock) {
-        super(blobIdFactory, deletedMessageVault, blobStore, clock);
+                                                          Clock clock,
+                                                          MessageIdManager messageIdManager,
+                                                          SessionProvider sessionProvider) {
+        super(blobIdFactory, deletedMessageVault, blobStore, clock, messageIdManager, sessionProvider);
     }
 
     @Override
@@ -84,6 +88,7 @@ private MessageContentDeletionEvent remapUsername(MessageContentDeletionEvent ev
             event.eventId(),
             username,
             event.mailboxId(),
+            event.mailboxACL(),
             event.messageId(),
             event.size(),
             event.internalDate(),
diff --git a/tmail-backend/tmail-third-party/ai-bot/src/test/java/com/linagora/tmail/mailet/rag/RagDeletionListenerTest.java b/tmail-backend/tmail-third-party/ai-bot/src/test/java/com/linagora/tmail/mailet/rag/RagDeletionListenerTest.java
index 3a357e4e70..18708b727b 100644
--- a/tmail-backend/tmail-third-party/ai-bot/src/test/java/com/linagora/tmail/mailet/rag/RagDeletionListenerTest.java
+++ b/tmail-backend/tmail-third-party/ai-bot/src/test/java/com/linagora/tmail/mailet/rag/RagDeletionListenerTest.java
@@ -40,6 +40,7 @@
 import org.apache.james.events.delivery.InVmEventDelivery;
 import org.apache.james.mailbox.events.MailboxEvents;
 import org.apache.james.mailbox.inmemory.InMemoryId;
+import org.apache.james.mailbox.model.MailboxACL;
 import org.apache.james.mailbox.model.TestMessageId;
 import org.apache.james.metrics.tests.RecordingMetricFactory;
 import org.awaitility.Awaitility;
@@ -101,6 +102,7 @@ void shouldDeleteRagDocumentOnMessageContentDeletionEvent() {
             Event.EventId.random(),
             username,
             InMemoryId.of(1),
+            MailboxACL.EMPTY,
             TestMessageId.of(1),
             123L,
             Instant.now(),
@@ -129,6 +131,7 @@ void shouldNotDeleteRagDocumentWhenAiRagSettingIsDisabled() {
             Event.EventId.random(),
             username,
             InMemoryId.of(1),
+            MailboxACL.EMPTY,
             TestMessageId.of(1),
             123L,
             Instant.now(),
@@ -158,6 +161,7 @@ void shouldNotDeleteRagDocumentWhenAiRagSettingIsNotSet() {
             Event.EventId.random(),
             username,
             InMemoryId.of(1),
+            MailboxACL.EMPTY,
             TestMessageId.of(1),
             123L,
             Instant.now(),