diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index d1e6a9f8a1f84aa0d60826941f5346eb6317579b..f49a7bb726fe0a716942fde05d3b083d609b01bd 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);