diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/send/MarmotNewMessageViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/send/MarmotNewMessageViewModel.kt
index 36e1beb9ad..ac02ee25e1 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/send/MarmotNewMessageViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/send/MarmotNewMessageViewModel.kt
@@ -93,7 +93,9 @@ open class MarmotNewMessageViewModel : ViewModel() {
 
     fun reply(note: Note) {
         replyTo.value = note
-        editingMessage.value = null
+        // Leaving edit mode drops the edited message's prefilled text too; kept, Send would
+        // post it again as a new reply.
+        if (editingMessage.value != null) cancelEdit()
     }
 
     /** Enter edit mode for my own [note], prefilled with the text it currently shows. */
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/concord/send/ConcordNewMessageViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/concord/send/ConcordNewMessageViewModel.kt
index ecd6dd4667..0361980ecb 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/concord/send/ConcordNewMessageViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/concord/send/ConcordNewMessageViewModel.kt
@@ -133,7 +133,9 @@ open class ConcordNewMessageViewModel : ViewModel() {
     fun reply(note: Note) {
         replyTo.value = note
         replyMode.value = ReplyMode.INLINE
-        editingMessage.value = null
+        // Leaving edit mode drops the edited message's prefilled text too; kept, Send would
+        // post it again as a new reply.
+        if (editingMessage.value != null) cancelEdit()
     }
 
     /** Enter edit mode for my own [note]: prefills the field with its current text; sending publishes a kind-1010 edit. */