From bb249e0881b65e1c96f0d0a5a838ae78dab91140 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 14 Feb 2017 23:16:51 +0100
Subject: [PATCH] only extract stanza-id from live messages when disco feature
 is set

---
 .../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 d1e6a9f8a..f49a7bb72 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -437,10 +437,10 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
 				final boolean safeToExtract;
 				if (isTypeGroupChat) {
 					by = conversation.getJid().toBareJid();
-					safeToExtract = true; //conversation.getMucOptions().hasFeature(Xmlns.STANZA_IDS);
+					safeToExtract = conversation.getMucOptions().hasFeature(Xmlns.STANZA_IDS);
 				} else {
 					by = account.getJid().toBareJid();
-					safeToExtract = true; //account.getXmppConnection().getFeatures().stanzaIds();
+					safeToExtract = account.getXmppConnection().getFeatures().stanzaIds();
 				}
 				if (safeToExtract) {
 					serverMsgId = extractStanzaId(packet, by);