diff --git a/src/status_im2/contexts/chat/messages/list/events.cljs b/src/status_im2/contexts/chat/messages/list/events.cljs
index 7cf6d51482..a4c97d94e1 100644
--- a/src/status_im2/contexts/chat/messages/list/events.cljs
+++ b/src/status_im2/contexts/chat/messages/list/events.cljs
@@ -16,6 +16,7 @@
 (defn prepare-message
   [{:keys [message-id
            clock-value
+           album-id
            message-type
            from
            outgoing
@@ -36,7 +37,8 @@
        :type              :message
        :message-id        message-id
        :outgoing          (boolean outgoing)
-       :albumize?         albumize?}
+       ;; always albumize outgoing (image already loaded) messages
+       :albumize?         (if (and album-id outgoing) true albumize?)}
       add-datemark
       add-timestamp))