diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py
index 1078916f..a68b6986 100644
--- a/poezio/core/handlers.py
+++ b/poezio/core/handlers.py
@@ -736,6 +736,15 @@ class HandlerCore:
         tmp_dir = get_image_cache()
         body = xhtml.get_body_from_message_stanza(
             message, use_xhtml=use_xhtml, extract_images_to=tmp_dir)
+
+        # TODO: #3314. Is this a MUC reflection?
+        # Is this an encrypted message? Is so ignore.
+        #   It is not possible in the OMEMO case to decrypt these messages
+        #   since we don't encrypt for our own device (something something
+        #   forward secrecy), but even for non-FS encryption schemes anyway
+        #   messages shouldn't have changed after a round-trip to the room.
+        # Otherwire replace the matching message we sent.
+
         if not body:
             return
 
diff --git a/poezio/tabs/muctab.py b/poezio/tabs/muctab.py
index 92dc1e51..9543e4c4 100644
--- a/poezio/tabs/muctab.py
+++ b/poezio/tabs/muctab.py
@@ -1716,6 +1716,7 @@ class MucTab(ChatTab):
             self.text_win.refresh()
             self.input.refresh()
             return
+        # TODO: #3314. Display outgoing MUC message.
         self.set_last_sent_message(msg, correct=correct)
         msg.send()
         self.chat_state = needed