From 44d1c8c4bbc0742f2d01a9c0ff3911584a2a1489 Mon Sep 17 00:00:00 2001
From: Michelle Tang <mtang@signal.org>
Date: Wed, 24 Jun 2026 12:08:02 -0400
Subject: [PATCH] Check for deletion in edit message.

---
 .../org/thoughtcrime/securesms/util/MessageConstraintsUtil.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/MessageConstraintsUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/util/MessageConstraintsUtil.kt
index e01b378545..735615b40b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/MessageConstraintsUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/MessageConstraintsUtil.kt
@@ -45,7 +45,7 @@ object MessageConstraintsUtil {
 
   @JvmStatic
   fun isValidEditMessageReceive(targetMessage: MessageRecord, editSender: Recipient, editServerTimestamp: Long): Boolean {
-    return isValidRemoteDeleteReceive(targetMessage, editSender.id, editServerTimestamp)
+    return !targetMessage.isRemoteDelete && isValidRemoteDeleteReceive(targetMessage, editSender.id, editServerTimestamp)
   }
 
   @JvmStatic