1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
index 6970109b8..6721a7975 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
@@ -1211,11 +1211,11 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
     }
 
     @Nullable
-    private boolean buildHeader(XmppAxolotlMessage axolotlMessage, Conversation conversation) {
-
-        Set<XmppAxolotlSession> remoteSessions = findSessionsForConversation(conversation);
+    private boolean buildHeader(XmppAxolotlMessage axolotlMessage, Conversation c) {
+        Set<XmppAxolotlSession> remoteSessions = findSessionsForConversation(c);
+        final boolean acceptEmpty = c.getMode() == Conversation.MODE_MULTI && c.getMucOptions().getUserCount() == 0;
         Collection<XmppAxolotlSession> ownSessions = findOwnSessions();
-        if (remoteSessions.isEmpty()) {
+        if (remoteSessions.isEmpty() && !acceptEmpty) {
             return false;
         }
         for (XmppAxolotlSession session : remoteSessions) {