diff --git a/src/components/conversation/conversation.scss b/src/components/conversation/conversation.scss
index 8bd391703..9f9c30747 100644
--- a/src/components/conversation/conversation.scss
+++ b/src/components/conversation/conversation.scss
@@ -99,10 +99,10 @@
 
     h4 {
       margin: 0.5em 0;
-      line-height: 1.5;
+      line-height: 1.1;
 
       button {
-        line-height: 1.5;
+        line-height: 1.1;
       }
     }
 
@@ -110,6 +110,9 @@
       display: flex;
       align-items: center;
       gap: 0.5em;
+      border: 1px solid var(--border);
+      border-radius: var(--roundness);
+      padding: 0.5em;
     }
   }
 
@@ -119,5 +122,9 @@
     flex-direction: column;
     align-items: stretch;
     bottom: 0;
+
+    .reply-form form {
+      margin-top: 0;
+    }
   }
 }
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index bad0277fd..079897f4a 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -211,9 +211,7 @@
       class="chat-view-reply-form panel-footer -flexible-height"
     >
       <div class="auto-reply-to-section">
-        <h4
-          class="reply-to-text"
-          >
+        <h4 class="reply-to-text">
           {{ explicitReplyStatus ? $t('status.reply_to_selected') : $t('status.reply_to_last') }}
           <button
             v-if="explicitReplyStatus"
@@ -224,27 +222,24 @@
             {{ $t('general.cancel') }}
           </button>
         </h4>
-        <div class="reply-to-preview">
-          <FAIcon
-            icon="reply"
-            flip="horizontal"
-          />
-          <StatusContent
-            :status="replyStatus"
-            compact
-            collapse
-          />
-        </div>
+        <StatusContent
+          :status="replyStatus"
+          class="reply-to-preview"
+          compact
+          collapse
+        />
       </div>
       <PostStatusForm
+        class="reply-form"
+        :reply-to="replyStatus.id"
+        :attentions="replyStatus.attentions"
+        :replied-user="replyStatus.user"
+        :replied-sibject="replyStatus.summary"
+        :replied-scope="replyStatus.visibility"
         :submit-on-enter="!mobileLayout"
         :preserve-focus="!mobileLayout"
         :auto-focus="!mobileLayout"
-        :reply-to="replyStatus.id"
-        :disable-quotes="true"
-        :copy-message-scope="replyStatus.visibility"
-        :attentions="replyStatus.attentions"
-        :replied-user="replyStatus.user"
+        disable-quotes
         mentions-line
         mentions-line-read-only
       />