1 files changed, 8 insertions, 1 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index ab804ce6..5d4f5d04 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -1,6 +1,12 @@
 import { find, filter, sortBy, toInteger } from 'lodash'
+import { statusType } from '../../modules/statuses.js'
 import Status from '../status/status.vue'
 
+const sortAndFilterConversation = (conversation) => {
+  conversation = filter(conversation, (status) => statusType(status) !== 'retweet')
+  return sortBy(conversation, 'id')
+}
+
 const conversation = {
   computed: {
     status () {
@@ -18,7 +24,8 @@ const conversation = {
       const conversationId = this.status.statusnet_conversation_id
       const statuses = this.$store.state.statuses.allStatuses
       const conversation = filter(statuses, { statusnet_conversation_id: conversationId })
-      return sortBy(conversation, 'id')
+
+      return sortAndFilterConversation(conversation)
     }
   },
   components: {