diff --git a/doc/ChangeLog b/doc/ChangeLog
index d9f89c30f..c0e7d6cf1 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-07 Pierrick LE GALL
+
+	* improvement: use a "filter" form for adding user comments.
+
 2005-11-05 Pierrick LE GALL
 
 	* bug 186 fixed: useless template theme icons deleted. Remaining
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 1f501bb0e..dd76aab67 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -144,12 +144,16 @@ FORM.filter FIELDSET LABEL {
   padding: 0;
 }
 
-FORM.filter FIELDSET LABEL INPUT, FORM.filter FIELDSET LABEL SELECT {
+FORM.filter FIELDSET LABEL INPUT,
+FORM.filter FIELDSET LABEL SELECT,
+FORM.filter FIELDSET LABEL TEXTAREA {
   display: block;
   margin: 0.5em 0;
 }
 
-FORM.filter FIELDSET P, FORM.filter FIELDSET INPUT {
+FORM.filter FIELDSET P,
+FORM.filter FIELDSET INPUT,
+FORM.filter FIELDSET TEXTAREA {
   clear: left;
   display: block;
 }
@@ -247,3 +251,11 @@ BODY#thePopuphelpPage #copyright {
   color: green;
   display: none;
 }
+
+FORM#addComment FIELDSET LABEL {
+  clear: both;
+}
+
+FORM#addComment FIELDSET INPUT[type="hidden"] {
+  display: none;
+}
\ No newline at end of file
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index 292505136..7a574b36e 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -174,19 +174,24 @@
 <!-- END comment -->
 
 <!-- BEGIN add_comment -->
-<h2>{L_ADD_COMMENT}</h2>
-<form  method="post" action="{U_ADD_COMMENT}">
-  <!-- BEGIN author_field -->
-<p><label>{L_AUTHOR}:<input type="text" name="author"></label>
-  <!-- END author_field -->
-  <!-- BEGIN author_known -->
-  <input type="hidden" name="author"  value="{comments.add_comment.author_known.KNOWN_AUTHOR}">
-  <!-- END author_known -->
-<p><label>{L_COMMENT}:
-<textarea name="content" rows="7" style="width:100%;"></textarea></label>
-<p><input type="submit" value="{L_SUBMIT}">
+<form  method="post" action="{U_ADD_COMMENT}" class="filter" id="addComment">
+  <fieldset>
+    <legend>{L_ADD_COMMENT}</legend>
+
+    <!-- BEGIN author_field -->
+    <label>{L_AUTHOR}<input type="text" name="author"></label>
+    <!-- END author_field -->
+
+    <!-- BEGIN author_known -->
+    <input type="hidden" name="author"  value="{comments.add_comment.author_known.KNOWN_AUTHOR}">
+    <!-- END author_known -->
+
+    <label>{L_COMMENT}<textarea name="content" rows="10" cols="80"></textarea></label>
+
+    <input type="submit" value="{L_SUBMIT}">
+  </fieldset>
 </form>
-       <!-- END add_comment -->
+<!-- END add_comment -->
 <!-- END comments -->
 
 </div>