From 5d910a7c7375d2ab98e1488529fc111b055899cb Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 9 Mar 2017 20:48:03 +0100
Subject: add origin-id to outgoing messages

---
 src/main/java/de/pixart/messenger/parser/MessageParser.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/main/java/de/pixart/messenger/parser')

diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java
index b34c382e4..2fa7160b6 100644
--- a/src/main/java/de/pixart/messenger/parser/MessageParser.java
+++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java
@@ -365,7 +365,13 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
         final Jid counterpart;
         final Jid to = packet.getTo();
         final Jid from = packet.getFrom();
-        final String remoteMsgId = packet.getId();
+        final Element originId = packet.findChild("origin-id", Namespace.STANZA_IDS);
+        final String remoteMsgId;
+        if (originId != null && originId.getAttribute("id") != null) {
+            remoteMsgId = originId.getAttribute("id");
+        } else {
+            remoteMsgId = packet.getId();
+        }
         boolean notify = false;
 
         if (from == null) {
-- 
cgit v1.2.3