diff --git a/src/status_im/ui2/screens/chat/messages/message.cljs b/src/status_im/ui2/screens/chat/messages/message.cljs
index 6070e313c3..c8b7503119 100644
--- a/src/status_im/ui2/screens/chat/messages/message.cljs
+++ b/src/status_im/ui2/screens/chat/messages/message.cljs
@@ -128,15 +128,11 @@
           (:parsed-text content)))
 
 (defn quoted-message
-  [{:keys [message-id chat-id]} reply pin?]
-  (let [{:keys [deleted? deleted-for-me?]} (get @(re-frame/subscribe [:chats/chat-messages chat-id])
-                                                message-id)
-        reply                              (assoc reply
-                                                  :deleted?        deleted?
-                                                  :deleted-for-me? deleted-for-me?
-                                                  :chat-id         chat-id)]
+  [{:keys [message-id chat-id]} pin?]
+  (let [quoted-message (get @(re-frame/subscribe [:chats/chat-messages chat-id])
+                            message-id)]
     [rn/view {:style (when-not pin? (style/quoted-message-container))}
-     [components.reply/reply-message reply false pin?]]))
+     [components.reply/reply-message quoted-message false pin?]]))
 
 (defn message-not-sent-text
   [chat-id message-id]
diff --git a/src/status_im2/contexts/chat/messages/content/pin/view.cljs b/src/status_im2/contexts/chat/messages/content/pin/view.cljs
index 0b0bd706f1..3f38c02992 100644
--- a/src/status_im2/contexts/chat/messages/content/pin/view.cljs
+++ b/src/status_im2/contexts/chat/messages/content/pin/view.cljs
@@ -59,5 +59,4 @@
                                (old-style/message-timestamp-text))
          :accessibility-label :message-timestamp}
         timestamp-str]]
-      [old-message/quoted-message {:message-id response-to :chat-id chat-id} (:quoted-message message)
-       true]]]))
+      [old-message/quoted-message {:message-id response-to :chat-id chat-id} true]]]))
diff --git a/src/status_im2/contexts/chat/messages/content/view.cljs b/src/status_im2/contexts/chat/messages/content/view.cljs
index 549e220f5d..3be6a2c478 100644
--- a/src/status_im2/contexts/chat/messages/content/view.cljs
+++ b/src/status_im2/contexts/chat/messages/content/view.cljs
@@ -121,7 +121,7 @@
            :on-long-press       #(on-long-press message-data context)}
           [rn/view {:style {:padding-vertical 8}}
            (when (and (seq response-to) quoted-message)
-             [old-message/quoted-message {:message-id response-to :chat-id chat-id} quoted-message])
+             [old-message/quoted-message {:message-id response-to :chat-id chat-id}])
            [rn/view
             {:style {:padding-horizontal 12
                      :flex-direction     :row}}
diff --git a/src/status_im2/contexts/chat/messages/pin/banner/view.cljs b/src/status_im2/contexts/chat/messages/pin/banner/view.cljs
index c169a7661b..126143336a 100644
--- a/src/status_im2/contexts/chat/messages/pin/banner/view.cljs
+++ b/src/status_im2/contexts/chat/messages/pin/banner/view.cljs
@@ -5,9 +5,9 @@
 
 (defn banner
   [chat-id]
-  (let [pinned-messages (rf/sub [:chats/pinned-sorted-list
-                                 chat-id])
-        latest-pinned-message (last pinned-messages)
+  (let [pinned-messages (rf/sub [:chats/pinned-sorted-list chat-id])
+        latest-pinned-message-id (-> pinned-messages last :message-id)
+        latest-pinned-message (get (rf/sub [:chats/chat-messages chat-id]) latest-pinned-message-id)
         latest-pin-text (get-in latest-pinned-message [:content :text])
         {:keys [deleted? deleted-for-me?]} latest-pinned-message
         pins-count (count pinned-messages)