From 334c844194ae0ff4be980ddd0254074af5550a48 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Thu, 26 Jan 2023 21:36:59 -0500
Subject: [PATCH] Fix html and subject on forwarded message

---
 .../java/eu/siacs/conversations/parser/MessageParser.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index f0b3d83e27289f9bac282e4d9f723fba2c4a211d..68fc3e714be4528c692f13304157767132e0ed9a 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -452,7 +452,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
         }
         boolean notify = false;
 
-        Element html = original.findChild("html", "http://jabber.org/protocol/xhtml-im");
+        Element html = packet.findChild("html", "http://jabber.org/protocol/xhtml-im");
         if (html != null && html.findChild("body", "http://www.w3.org/1999/xhtml") == null) {
             html = null;
         }
@@ -619,7 +619,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
             }
 
             if (html != null) message.addPayload(html);
-            message.setSubject(original.findChildContent("subject"));
+            message.setSubject(packet.findChildContent("subject"));
             message.setCounterpart(counterpart);
             message.setRemoteMsgId(remoteMsgId);
             message.setServerMsgId(serverMsgId);