1 files changed, 11 insertions, 2 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js
index bc9d6e6c..87fff879 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -9,6 +9,7 @@ const Status = {
   props: [
     'statusoid',
     'expandable',
+    'inConversation',
     'focused'
   ],
   data: () => ({
@@ -18,7 +19,10 @@ const Status = {
     userExpanded: false
   }),
   computed: {
-    hideAttachments () { return this.$store.state.config.hideAttachments },
+    hideAttachments () {
+      return (this.$store.state.config.hideAttachments && !this.inConversation) ||
+        (this.$store.state.config.hideAttachmentsInConv && this.inConversation)
+    },
     retweet () { return !!this.statusoid.retweeted_status },
     retweeter () { return this.statusoid.user.name },
     status () {
@@ -32,7 +36,12 @@ const Status = {
       return !!this.$store.state.users.currentUser
     },
     muted () { return !this.unmuted && this.status.user.muted },
-    isReply () { return !!this.status.in_reply_to_status_id }
+    isReply () { return !!this.status.in_reply_to_status_id },
+    borderColor () {
+      return {
+        borderBottomColor: this.$store.state.config.colors['base02']
+      }
+    }
   },
   components: {
     Attachment,