diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
index 8444899e2..f88a60010 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -79,17 +79,18 @@ const ChatMessage = {
     },
     isCustomReply() {
       if (!this.previousItem) return false
+      if (!this.chatItem.data.in_reply_to_status_id) return false
       console.log('==')
-      console.log('PREV', toValue(this.previousItem.data.raw_html))
-      console.log('CURR', toValue(this.chatItem.data.raw_html))
+      console.log('PREV', toValue(this.previousItem.data.text))
+      console.log('CURR', toValue(this.chatItem.data.text))
       return (
         this.previousItem.data.id !== this.chatItem.data.in_reply_to_status_id
       )
     },
     customReplyTo() {
-      return find(this.$store.state.statuses.allStatuses, {
-        id: this.chatItem.data.in_reply_to_status_id,
-      })
+      return this.$store.state.statuses.allStatusesObject[
+        this.chatItem.data.in_reply_to_status_id
+      ]
     },
     messageForStatusContent() {
       return {
diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue
index b1fa85fe7..91ad9a4eb 100644
--- a/src/components/chat_message/chat_message.vue
+++ b/src/components/chat_message/chat_message.vue
@@ -37,7 +37,9 @@
             />
             {{ $t('status.reply_to') }}
           </strong>
+          <!-- v-if is there because status might not be loaded yet -->
           <StatusBody
+            v-if="customReplyTo"
             class="reply-body"
             :status="customReplyTo"
             collapse
diff --git a/src/components/status_body/status_body.scss b/src/components/status_body/status_body.scss
index 9954663e7..f248e8099 100644
--- a/src/components/status_body/status_body.scss
+++ b/src/components/status_body/status_body.scss
@@ -26,7 +26,7 @@
 
   .text {
     &.-single-line {
-      white-space: nowrap;
+      white-space-collapse: collapse;
       text-overflow: ellipsis;
       overflow: hidden;
       height: 1.4em;