diff --git a/message/classes/task/migrate_message_data.php b/message/classes/task/migrate_message_data.php
index 53e21822bf6..2cf5dbdcd11 100644
--- a/message/classes/task/migrate_message_data.php
+++ b/message/classes/task/migrate_message_data.php
@@ -236,7 +236,7 @@ class migrate_message_data extends \core\task\adhoc_task {
         }
 
         // Check if we need to mark this message as deleted for the user to.
-        if ($message->timeusertodeleted) {
+        if ($message->timeusertodeleted and ($message->useridfrom != $message->useridto)) {
             $mua = new \stdClass();
             $mua->userid = $message->useridto;
             $mua->messageid = $messageid;