diff --git a/webapp/src/Controller/Team/ClarificationController.php b/webapp/src/Controller/Team/ClarificationController.php
index 11f4c3edf8..ab376d91b2 100644
--- a/webapp/src/Controller/Team/ClarificationController.php
+++ b/webapp/src/Controller/Team/ClarificationController.php
@@ -70,7 +70,7 @@ public function viewAction(Request $request, int $clarId): Response
             if ($clarification->getProblem()) {
                 $formData['subject'] = sprintf('%d-%d', $clarification->getContest()->getCid(), $clarification->getProblem()->getProbid());
             } else {
-                $formData['subject'] = sprintf('%d-%s', $clarification->getContest()->getCid(), $clarification->getQueue());
+                $formData['subject'] = sprintf('%d-%s', $clarification->getContest()->getCid(), $clarification->getCategory());
             }
 
             $formData['message'] = "> " . str_replace("\n", "\n> ", Utils::wrapUnquoted($clarification->getBody())) . "\n\n";
@@ -80,6 +80,8 @@ public function viewAction(Request $request, int $clarId): Response
             ->setAction($this->generateUrl('team_clarification', ['clarId' => $clarId]))
             ->getForm();
 
+        $form->remove('subject');
+
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
diff --git a/webapp/templates/team/partials/clarification_content.html.twig b/webapp/templates/team/partials/clarification_content.html.twig
index f3f5ea63d0..366514f01e 100644
--- a/webapp/templates/team/partials/clarification_content.html.twig
+++ b/webapp/templates/team/partials/clarification_content.html.twig
@@ -9,23 +9,13 @@
     <div class="card card-body">
         {{ form_start(form) }}
         {{ form_row(form.recipient) }}
-        {{ form_row(form.subject) }}
-        <div class="list-group mb-3">
-            <div class="list-group-item">
-                <div class="flex-column">
-                    <label for="team_clarification_message" class="form-label text-muted d-flex justify-content-end"><small>message</small></label>
-                </div>
-                {{ form_row(form.message) }}
+        {{ form_row(form.message) }}
+        <div class="mb-3">
+            <div class="flex-column">
+                <label class="form-label text-muted d-flex justify-content-end"><small>message preview</small></label>
             </div>
-            <div class="list-group-item">
-                <div class="mb-3">
-                    <div class="flex-column">
-                        <label class="form-label text-muted d-flex justify-content-end"><small>message preview</small></label>
-                    </div>
-                    <div class="card">
-                        <div class="card-body" id="messagepreview">Start typing to see a preview of your message</div>
-                    </div>
-                </div>
+            <div class="card">
+                <div class="card-body" id="messagepreview">Start typing to see a preview of your message</div>
             </div>
         </div>
         {{ form_end(form) }}