diff --git a/src/backend/core/mda/inbound.py b/src/backend/core/mda/inbound.py
index 70fdd828..baf57477 100644
--- a/src/backend/core/mda/inbound.py
+++ b/src/backend/core/mda/inbound.py
@@ -139,7 +139,7 @@ def deliver_inbound_message(
             channel=channel,
         )
         logger.info(
-            "Queued inbound message %s for spam processing (recipient: %s)",
+            "Queued inbound message %s (recipient: %s)",
             inbound_message.id,
             recipient_email,
         )
diff --git a/src/backend/core/mda/selfcheck.py b/src/backend/core/mda/selfcheck.py
index 9dbc85a6..37c47749 100644
--- a/src/backend/core/mda/selfcheck.py
+++ b/src/backend/core/mda/selfcheck.py
@@ -321,6 +321,10 @@ that the mail delivery pipeline is working correctly.</p>
         logger.error("Selfcheck failed: %s", e, exc_info=True)
 
     finally:
+        # Wait a bit for indexation, thread.update_stats() to be done in order
+        # to avoid race conditions on deleted objects.
+        time.sleep(5)
+
         if message:
             _cleanup_test_data(message)
         if received_message: