diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index 1d8915d91f6d5380f1b50ff233ffcfaed2ad331a..e8103eec00468c94e7ee20da53ac167be323212a 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -51,6 +51,7 @@ import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.utils.JidHelper;
 import eu.siacs.conversations.utils.UIHelper;
 import eu.siacs.conversations.xml.Element;
+import eu.siacs.conversations.xml.Namespace;
 import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.jingle.RtpCapability;
 import eu.siacs.conversations.xmpp.pep.Avatar;
@@ -340,6 +341,28 @@ public class Contact implements ListItem, Blockable {
         return resource.equals("") ? getJid() : getJid().withResource(resource);
     }
 
+    public boolean isApp() {
+        if (getPresences().isEmpty()) {
+            // No caps so let's guess that domains are apps
+            return getJid().isDomainJid();
+        }
+
+        final var hasCommands = resourceWhichSupport(Namespace.COMMANDS) != null;
+        final var bot = getPresences().anyIdentity("client", "bot");
+        final var client = getPresences().anyIdentity("client", null);
+        final var account = getPresences().anyIdentity("account", null);
+
+        // Clients are not apps, we chat with them
+        if ((client || account) && !bot) return false;
+
+        final var conference = getPresences().anyIdentity("conference", null);
+        // A MUC component is an app
+        if (conference && getJid().isDomainJid()) return hasCommands;
+
+        // If it's not a client or conference, guess it's an app
+        return !client && !conference && hasCommands;
+    }
+
     public boolean setPhotoUri(String uri) {
         if (uri != null && !uri.equals(this.photoUri)) {
             this.photoUri = uri;
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index bc74244b39a9f654e1bc8980514e6e9e72fc15f4..492f11503aadbb336581951b3ccf65dca6a56b03 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -1746,7 +1746,7 @@ public class Conversation extends AbstractEntity
     public int getCurrentTab() {
         if (mCurrentTab >= 0) return mCurrentTab;
 
-        if (!isRead(null) || getContact().resourceWhichSupport(Namespace.COMMANDS) == null) {
+        if (!getContact().isApp() || !isRead(null)) {
             return 0;
         }