diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 168bea369f3c023f26df9943f38cbf465a450249..3907222c66b778d22092fc50de9b16350f462261 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -44,6 +44,7 @@ import im.conversations.android.xmpp.model.correction.Replace;
 import im.conversations.android.xmpp.model.forward.Forwarded;
 import im.conversations.android.xmpp.model.markers.Displayed;
 import im.conversations.android.xmpp.model.occupant.OccupantId;
+import im.conversations.android.xmpp.model.oob.OutOfBandData;
 import im.conversations.android.xmpp.model.reactions.Reactions;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -547,10 +548,13 @@ public class MessageParser extends AbstractParser
         final boolean isTypeGroupChat =
                 packet.getType()
                         == im.conversations.android.xmpp.model.stanza.Message.Type.GROUPCHAT;
-        final String pgpEncrypted = packet.findChildContent("x", "jabber:x:encrypted");
+        final var encrypted =
+                packet.getOnlyExtension(im.conversations.android.xmpp.model.pgp.Encrypted.class);
+        final String pgpEncrypted = encrypted == null ? null : encrypted.getContent();
+        ;
 
-        final Element oob = packet.findChild("x", Namespace.OOB);
-        final String oobUrl = oob != null ? oob.findChildContent("url") : null;
+        final var oob = packet.getExtension(OutOfBandData.class);
+        final String oobUrl = oob != null ? oob.getURL() : null;
         final var replace = packet.getExtension(Replace.class);
         final var replacementId = replace == null ? null : replace.getId();
         final var axolotlEncrypted = packet.getOnlyExtension(Encrypted.class);
diff --git a/src/main/java/eu/siacs/conversations/xml/LocalizedContent.java b/src/main/java/eu/siacs/conversations/xml/LocalizedContent.java
index bb50e9e757f7f480ff26f35334c00ee18c6045e6..fc1c1ca1b7e6d56294d0156d87d76208ec21735f 100644
--- a/src/main/java/eu/siacs/conversations/xml/LocalizedContent.java
+++ b/src/main/java/eu/siacs/conversations/xml/LocalizedContent.java
@@ -1,7 +1,6 @@
 package eu.siacs.conversations.xml;
 
 import com.google.common.collect.Iterables;
-import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;