Use statusOrConversation component in timeline.

src/components/timeline/timeline.js

 import Status from '../status/status.vue'
 import timelineFetcher from '../../services/timeline_fetcher/timeline_fetcher.service.js'
+import StatusOrConversation from '../status_or_conversation/status_or_conversation.vue'
 
 const Timeline = {
   props: [
@@ -7,7 +8,8 @@ const Timeline = {
     'timelineName'
   ],
   components: {
-    Status
+    Status,
+    StatusOrConversation
   },
   created () {
     const store = this.$store

src/components/timeline/timeline.vue

@@ -7,7 +7,7 @@
         </p>
       </div>
     </a>
-    <status v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status>
+    <status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status-or-conversation>
     <a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading">
       <div class="base01-background base05-border new-status-notification">
         <p class="text-center" >