diff --git a/src/status_im/chat/screen.cljs b/src/status_im/chat/screen.cljs
index 2274a9eef6..17b6613e36 100644
--- a/src/status_im/chat/screen.cljs
+++ b/src/status_im/chat/screen.cljs
@@ -80,6 +80,7 @@
                     (add-message-color contact-by-identity)
                     (assoc :group-chat group-chat)
                     (assoc :messages-count messages-count)
+                    (assoc :index index)
                     (assoc :last-message (= (js/parseInt index) (dec messages-count))))]
     (list-item [chat-message message])))
 
diff --git a/src/status_im/chat/views/message.cljs b/src/status_im/chat/views/message.cljs
index 9798a47305..d3316f4a7f 100644
--- a/src/status_im/chat/views/message.cljs
+++ b/src/status_im/chat/views/message.cljs
@@ -225,7 +225,7 @@
            :style  st/photo}]])
 
 (defn incoming-group-message-body
-  [{:keys [selected same-author from] :as message} content]
+  [{:keys [selected same-author from index] :as message} content]
   (let [delivery-status :seen-by-everyone]
     [view st/group-message-wrapper
      (when selected
@@ -234,7 +234,8 @@
         "Mar 7th, 15:22"])
      [view (st/incoming-group-message-body-st message)
       [view st/message-author
-       (when (not same-author) [member-photo from])]
+       (when (or (= index 1)
+                 (not same-author)) [member-photo from])]
       [view st/group-message-view
        content
        ;; TODO show for last or selected