2 files changed, 19 insertions, 9 deletions
diff --git a/src/main/java/de/pixart/messenger/services/AvatarService.java b/src/main/java/de/pixart/messenger/services/AvatarService.java
index 06b0e1f5f..bf415515b 100644
--- a/src/main/java/de/pixart/messenger/services/AvatarService.java
+++ b/src/main/java/de/pixart/messenger/services/AvatarService.java
@@ -54,7 +54,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
 
     protected XmppConnectionService mXmppConnectionService = null;
 
-    public AvatarService(XmppConnectionService service) {
+    AvatarService(XmppConnectionService service) {
         this.mXmppConnectionService = service;
     }
 
@@ -231,7 +231,13 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
             if (bookmark.getConversation() != null) {
                 return get(bookmark.getConversation(), size, cachedOnly);
             } else {
-                String seed = bookmark.getJid() != null ? bookmark.getJid().asBareJid().toString() : null;
+                Jid jid = bookmark.getJid();
+                Account account = bookmark.getAccount();
+                Contact contact = jid == null ? null : account.getRoster().getContact(jid);
+                if (contact != null && contact.getAvatar() != null) {
+                    return get(contact, size, cachedOnly);
+                }
+                String seed = jid != null ? jid.asBareJid().toString() : null;
                 return get(bookmark.getDisplayName(), seed, size, cachedOnly);
             }
         } else {
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index f45a5ac8e..bf760949a 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -3223,10 +3223,12 @@ public class XmppConnectionService extends Service {
                             updateAccountUi();
                         } else {
                             Contact contact = a.getRoster().getContact(avatar.owner);
-                            contact.setAvatar(avatar);
-                            getAvatarService().clear(contact);
-                            updateConversationUi();
-                            updateRosterUi();
+                            if (contact.setAvatar(avatar)) {
+                                syncRoster(account);
+                                getAvatarService().clear(contact);
+                                updateConversationUi();
+                                updateRosterUi();
+                            }
                         }
                         if (callback != null) {
                             callback.success(avatar);
@@ -3278,9 +3280,11 @@ public class XmppConnectionService extends Service {
                                     updateAccountUi();
                                 } else {
                                     Contact contact = account.getRoster().getContact(avatar.owner);
-                                    contact.setAvatar(avatar);
-                                    getAvatarService().clear(contact);
-                                    updateRosterUi();
+                                    if (contact.setAvatar(avatar)) {
+                                        syncRoster(account);
+                                        getAvatarService().clear(contact);
+                                        updateRosterUi();
+                                    }
                                 }
                                 updateConversationUi();
                             } else {