From 03588b89d11dd0e5f1d249529e5dcde36ca823d4 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Fri, 31 Jan 2025 16:22:23 +0100
Subject: [PATCH 1/2] XEP-0461: Stop using origin-id.

---
 xep-0461.xml | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/xep-0461.xml b/xep-0461.xml
index 539c18d29..e5623a08c 100644
--- a/xep-0461.xml
+++ b/xep-0461.xml
@@ -25,24 +25,25 @@
       <surname>Wirth</surname>
       <email>nataliew@laposte.net</email>
     </author>
-    <author>
-      <firstname>Marvin</firstname>
-      <surname>Wissfeld</surname>
-      <email>xsf@larma.de</email>
-      <jid>jabber@larma.de</jid>
-    </author>
+    &larma;
+    <revision>
+      <version>0.3.0</version>
+      <date>2025-01-31</date>
+      <initials>lmw</initials>
+      <remark>Stop using origin-id.</remark>
+    </revision>
     <revision>
       <version>0.2.0</version>
       <date>2022-12-09</date>
       <initials>nc</initials>
       <remark>Fix example character counting. Add disco feature. Relax the 'to' attribute constraints.</remark>
     </revision>
-  <revision>
-    <version>0.1.0</version>
-    <date>2022-01-25</date>
-    <initials>XEP Editor (jsc)</initials>
-    <remark>Accepted by vote of Council on 2022-01-05.</remark>
-  </revision>
+    <revision>
+      <version>0.1.0</version>
+      <date>2022-01-25</date>
+      <initials>XEP Editor (jsc)</initials>
+      <remark>Accepted by vote of Council on 2022-01-05.</remark>
+    </revision>
     <revision>
       <version>0.0.1</version>
       <date>2022-01-01</date>
@@ -149,9 +150,7 @@
         This implies that group chat messages without a &xep0359; stanza-id cannot be replied to.
       </p>
       <p>
-        For other message types the sender should use the 'id' from a &xep0359;
-        &lt;origin-id&gt; if present, or the value of the 'id' attribute on the
-        &lt;message&gt; otherwise.
+        For other message types the sender should use the value of the 'id' attribute on the &lt;message&gt;.
       </p>
     </section2>
   </section1>

From 6108d3874957819231d677c07103de3955e1b0c0 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Thu, 1 May 2025 11:28:54 +0100
Subject: [PATCH 2/2] XEP-0461: Add remark that chat messages should only reply
 to a single message

---
 xep-0461.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xep-0461.xml b/xep-0461.xml
index e5623a08c..1ded37602 100644
--- a/xep-0461.xml
+++ b/xep-0461.xml
@@ -28,9 +28,9 @@
     &larma;
     <revision>
       <version>0.3.0</version>
-      <date>2025-01-31</date>
+      <date>2025-05-01</date>
       <initials>lmw</initials>
-      <remark>Stop using origin-id.</remark>
+      <remark>Stop using origin-id, add remark that chat messages should not reply to multiple messages.</remark>
     </revision>
     <revision>
       <version>0.2.0</version>
@@ -139,6 +139,7 @@
 
   <section1 topic='Business Rules' anchor='rules'>
     <p>Answers MUST NOT be be assumed to relate to any other messages than the referenced one.</p>
+    <p>Messages of type 'chat' or type 'groupchat' SHOULD NOT have more than one &lt;reply&gt; element. Messages of type 'normal' MAY carry multple &lt;reply&gt; elements.</p>
     <section2 topic='Using the correct ID' anchor='business-id'>
       <p>
         For messages of type 'groupchat', the stanza's 'id' attribute MUST NOT be used for replies. Instead, in group