1 files changed, 9 insertions, 6 deletions
diff --git a/src/main/java/de/pixart/messenger/services/AvatarService.java b/src/main/java/de/pixart/messenger/services/AvatarService.java
index d6cc3712c..f38102866 100644
--- a/src/main/java/de/pixart/messenger/services/AvatarService.java
+++ b/src/main/java/de/pixart/messenger/services/AvatarService.java
@@ -274,12 +274,15 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
         if (bitmap != null || cachedOnly) {
             return bitmap;
         }
-        final List<MucOptions.User> users = mucOptions.getUsersRelevantForNameAndAvatar();
-        if (users.size() == 0) {
-            Conversation c = mucOptions.getConversation();
-            bitmap = getImpl(c.getName().toString(), c.getJid().asBareJid().toString(), size);
-        } else {
-            bitmap = getImpl(users, size);
+        bitmap = mXmppConnectionService.getFileBackend().getAvatar(mucOptions.getAvatar(), size);
+        if (bitmap == null) {
+            final List<MucOptions.User> users = mucOptions.getUsersRelevantForNameAndAvatar();
+            if (users.size() == 0) {
+                Conversation c = mucOptions.getConversation();
+                bitmap = getImpl(c.getName().toString(), c.getJid().asBareJid().toString(), size);
+            } else {
+                bitmap = getImpl(users, size);
+            }
         }
         this.mXmppConnectionService.getBitmapCache().put(KEY, bitmap);
         return bitmap;