diff --git a/media/commitfest/js/commitfest.js b/media/commitfest/js/commitfest.js
index 461227f8..27a54f94 100644
--- a/media/commitfest/js/commitfest.js
+++ b/media/commitfest/js/commitfest.js
@@ -32,6 +32,7 @@ function findLatestThreads() {
                 sel.append(
                     $("<option/>")
                         .text(`${i.from}: ${i.subj} (${i.date})`)
+                        .data("subject", i.subj)
                         .val(i.msgid),
                 );
             });
@@ -60,12 +61,18 @@ function browseThreads(attachfunc, closefunc) {
         if (!msgid || msgid === "") {
             msgid = $("#attachThreadList").val();
             if (!msgid) return;
+            subject = $("#attachThreadList option:selected").data("subject");
+            subject = subject.replace(/\bre: /gi, "");
+            subject = subject.replace(/\bfwd: /gi, "");
+            // Strips [PATCH], [POC], etc. prefixes
+            subject = subject.replace(/\[\w+\]: /gi, "");
+            subject = subject.replace(/\[\w+\] /gi, "");
         }
 
         $("#attachThreadListWrap").addClass("loading");
         $("#attachThreadSearchButton").addClass("disabled");
         $("#attachThreadButton").addClass("disabled");
-        if (attachfunc(msgid)) {
+        if (attachfunc(msgid, subject)) {
             $("#attachModal").modal("hide");
         }
         $("#attachThreadListWrap").removeClass("loading");
@@ -351,3 +358,22 @@ git fetch commitfest cf/${patchId}
 git checkout commitfest/cf/${patchId}
 `);
 }
+
+/* Build our button callbacks */
+$(document).ready(() => {
+    $("button.attachThreadButton").each((i, o) => {
+        const b = $(o);
+        b.click(() => {
+            $("#attachThreadAttachOnly").val("1");
+            browseThreads((msgid, subject) => {
+                b.prev().val(msgid);
+                const description_field = $("#id_name");
+                if (description_field.val() === "") {
+                    description_field.val(subject);
+                }
+                return true;
+            });
+            return false;
+        });
+    });
+});
diff --git a/pgcommitfest/commitfest/templates/base_form.html b/pgcommitfest/commitfest/templates/base_form.html
index 91f2e91e..3bfaca85 100644
--- a/pgcommitfest/commitfest/templates/base_form.html
+++ b/pgcommitfest/commitfest/templates/base_form.html
@@ -110,20 +110,5 @@ <h3>Search user</h3>
 	  $('#searchUserSearchField').focus();
 });
 {%endif%}
-
-/* Build our button callbacks */
-$(document).ready(function() {
-   $('button.attachThreadButton').each(function (i,o) {
-      var b = $(o);
-      b.click(function() {
-	 $('#attachThreadAttachOnly').val('1');
-         browseThreads(function(msgid) {
-            b.prev().val(msgid);
-            return true;
-         });
-         return false;
-      });
-   });
-});
 </script>
 {%endblock%}