2 files changed, 15 insertions, 6 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 48b8aaaa..95e484cd 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -30,7 +30,8 @@ const conversation = {
   },
   props: [
     'statusoid',
-    'collapsable'
+    'collapsable',
+    'replying'
   ],
   computed: {
     status () {
@@ -102,6 +103,9 @@ const conversation = {
     },
     setHighlight (id) {
       this.highlight = id
+    },
+    toggleReplying () {
+      this.$emit('toggleReplying')
     }
   }
 }
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 5528fef6..42d009c9 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -10,14 +10,19 @@
       <div class="timeline">
         <status
           v-for="status in conversation"
-          @goto="setHighlight" :key="status.id"
-          :inlineExpanded="collapsable" :statusoid="status"
-          :expandable='false' :focused="focused(status.id)"
+          @goto="setHighlight"
+          @toggleReplying="toggleReplying"
+          :replying="replying && status.id === statusId"
+          :key="status.id"
+          :inlineExpanded="collapsable"
+          :statusoid="status"
+          :expandable='false'
+          :focused="focused(status.id)"
           :inConversation='true'
           :highlight="highlight"
           :replies="getReplies(status.id)"
-          class="status-fadein">
-        </status>
+          class="status-fadein"
+        />
       </div>
     </div>
   </div>