diff --git a/forms.tmpl b/forms.tmpl
index e21b439..e215afd 100644
--- a/forms.tmpl
+++ b/forms.tmpl
@@ -181,7 +181,7 @@
   </div>
   <form action="${c.req.makeUri(action, false) & "#preview"}" method="POST">
     #if action == "doreply":
-      <input type="hidden" name="subject" value="${title}"/>
+      ${HiddenField(c, "subject", title)}
     #else:
       ${FieldValid(c, "subject", "Subject:")}
       ${TextWidget(c, "subject", title, maxlength=100)}
diff --git a/forum.nim b/forum.nim
index 5ac4ad6..d330dbe 100644
--- a/forum.nim
+++ b/forum.nim
@@ -103,6 +103,11 @@ proc TextWidget(c: TForumData, name, defaultText: string,
   return """<input type="text" name="$1" maxlength="$2" value="$3" $4/>""" % [
     name, $maxlength, x, if size != -1: "size=\"" & $size & "\"" else: ""]
 
+proc HiddenField(c: TForumData, name, defaultText: string): string =
+  let x = if defaultText != reuseText: defaultText
+          else: xmlEncode(c.req.params[name])
+  return """<input type="hidden" name="$1" value="$2"/>""" % [name, x]
+
 proc TextAreaWidget(c: TForumData, name, defaultText: string): string =
   let x = if defaultText != reuseText: defaultText
           else: xmlEncode(c.req.params[name])