diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 255b0e7ee9a38bdd703876fa86b16ee716506330..8367f7cba0da69838484bd194b9f5ba20f7417a3 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -1325,6 +1325,8 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl if (sessions == null) return 1; int count = 2 + sessions.size(); + if (mTabs == null) return count; + if (count > 2) { mTabs.setTabMode(TabLayout.MODE_SCROLLABLE); } else {