diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue
index 1906444fe..a5c0627a2 100644
--- a/src/components/chat_message/chat_message.vue
+++ b/src/components/chat_message/chat_message.vue
@@ -145,8 +145,12 @@
                 :full-content="true"
               >
                 <template #footer>
-                  <EmojiReactions :status="message" />
+                  <EmojiReactions
+                    v-if="isStatus"
+                    :status="message"
+                  />
                   <Quote
+                    v-if="isStatus"
                     class="quoted-post"
                     :status-id="quoteId"
                     :status-url="quoteUrl"
diff --git a/src/components/chat_view/chat_view.js b/src/components/chat_view/chat_view.js
index ee72d592f..236ae3ca5 100644
--- a/src/components/chat_view/chat_view.js
+++ b/src/components/chat_view/chat_view.js
@@ -343,6 +343,8 @@ const Chat = {
           accountId: this.recipientId,
           credentials: useOAuthStore().token,
         })
+        this.$store.commit('addNewUsers', [data.account])
+        data.account = this.$store.getters.findUser(data.account.id)
         this.chat = data
       } catch (e) {
         console.error('Error creating or getting a chat', e)