1 files changed, 12 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/services/AvatarService.java b/src/main/java/de/pixart/messenger/services/AvatarService.java
index b37811b7f..c38fdcc99 100644
--- a/src/main/java/de/pixart/messenger/services/AvatarService.java
+++ b/src/main/java/de/pixart/messenger/services/AvatarService.java
@@ -38,6 +38,7 @@ import de.pixart.messenger.entities.Conversational;
 import de.pixart.messenger.entities.ListItem;
 import de.pixart.messenger.entities.Message;
 import de.pixart.messenger.entities.MucOptions;
+import de.pixart.messenger.http.services.MuclumbusService;
 import de.pixart.messenger.utils.UIHelper;
 import de.pixart.messenger.xmpp.OnAdvancedStreamFeaturesLoaded;
 import de.pixart.messenger.xmpp.XmppConnection;
@@ -82,10 +83,21 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
             return get((ListItem) avatarable, size, cachedOnly);
         } else if (avatarable instanceof MucOptions.User) {
             return get((MucOptions.User) avatarable, size, cachedOnly);
+        } else if (avatarable instanceof MuclumbusService.Room) {
+            return get((MuclumbusService.Room) avatarable, size, cachedOnly);
         }
         throw new AssertionError("AvatarService does not know how to generate avatar from "+avatarable.getClass().getName());
     }
 
+    private Bitmap get(final MuclumbusService.Room result, final int size, boolean cacheOnly) {
+        final Jid room = result.getRoom();
+        Conversation conversation = room != null ? mXmppConnectionService.findFirstMuc(room) : null;
+        if (conversation != null) {
+            return get(conversation, size, cacheOnly);
+        }
+        return get(result.getName(), room != null ? room.asBareJid().toEscapedString() : result.getName(), size, cacheOnly);
+    }
+
     private Bitmap get(final Contact contact, final int size, boolean cachedOnly) {
         if (contact.isSelf()) {
             return get(contact.getAccount(), size, cachedOnly);