diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index d6877e9429cac1b124309584efb061222b01f569..02aa247dbe5ea16c77543193e25b83f8529c0a53 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -677,7 +677,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         if (this.payloads == null) return null;
 
         for (Element el : this.payloads) {
-            if (el.getName().equals("thread") && el.getNamespace().equals("jabber:client")) {
+            if ("thread".equals(el.getName()) && "jabber:client".equals(el.getNamespace())) {
                 return el;
             }
         }