--- a/src/com/beem/project/beem/service/RosterAdapter.java	Sun Apr 24 02:02:26 2011 +0200
+++ b/src/com/beem/project/beem/service/RosterAdapter.java	Thu May 05 01:06:49 2011 +0200
@@ -409,7 +409,7 @@
 	    String bare = StringUtils.parseBareAddress(from);
 	    if (avatarId == null)
 		mAvatarIdmap.remove(bare);
-	    else {
+	    else if (avatarInfos.size() > 0) {
 		mAvatarIdmap.put(bare, avatarId);
 	    }
 	}