1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/avatar/AvatarCache.java b/src/main/java/de/thedevstack/conversationsplus/services/avatar/AvatarCache.java
index a4def149..5e10f27c 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/avatar/AvatarCache.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/avatar/AvatarCache.java
@@ -12,8 +12,10 @@ import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.entities.ListItem;
 import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.entities.MucOptions;
+import de.thedevstack.conversationsplus.enums.MessageDirection;
 import de.thedevstack.conversationsplus.utils.AvatarUtil;
 import de.thedevstack.conversationsplus.utils.ImageUtil;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.utils.UIHelper;
 
 /**
@@ -177,7 +179,7 @@ public final class AvatarCache {
 
     public static Bitmap get(Message message, int size, boolean cachedOnly) {
         final Conversation conversation = message.getConversation();
-        if (message.getStatus() == Message.STATUS_RECEIVED) {
+        if (MessageUtil.isIncomingMessage(message)) {
             Contact c = message.getContact();
             if (c != null && (c.getProfilePhoto() != null || c.getAvatar() != null)) {
                 return get(c, size, cachedOnly);