diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index c103994b54..7b67553a0f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -2367,7 +2367,8 @@ class ConversationFragment :
   }
 
   private fun handleEditMessage(conversationMessage: ConversationMessage) {
-    if (!MessageConstraintsUtil.isWithinMaxEdits(conversationMessage.messageRecord)) {
+    val isNoteToSelf = viewModel.recipientSnapshot?.isSelf ?: false
+    if (!isNoteToSelf && !MessageConstraintsUtil.isWithinMaxEdits(conversationMessage.messageRecord)) {
       Log.i(TAG, "Too many edits to the message")
       Dialogs.showAlertDialog(requireContext(), null, resources.getQuantityString(R.plurals.ConversationActivity_edit_message_too_many_edits, MessageConstraintsUtil.MAX_EDIT_COUNT, MessageConstraintsUtil.MAX_EDIT_COUNT))
 
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 b91a0d6f4a..8c7ee8bd46 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/MessageConstraintsUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/MessageConstraintsUtil.kt
@@ -62,8 +62,11 @@ object MessageConstraintsUtil {
     } else {
       targetMessage
     }
+
+    val isNoteToSelf = targetMessage.toRecipient.isSelf && targetMessage.fromRecipient.isSelf
+
     return isValidRemoteDeleteSend(originalMessage, currentTime) &&
-      targetMessage.revisionNumber < MAX_EDIT_COUNT &&
+      (isNoteToSelf || targetMessage.revisionNumber < MAX_EDIT_COUNT) &&
       !targetMessage.isViewOnceMessage() &&
       !targetMessage.hasAudio() &&
       !targetMessage.hasSharedContact() &&