diff --git a/doc/config.html b/doc/config.html
index 9a6841b2..b6f6ffe3 100755
--- a/doc/config.html
+++ b/doc/config.html
@@ -376,6 +376,12 @@ This optional comment is displayed on top of the text entry field when submittin
 a new message. It can contain a sentence like "<I>Please enter your message here</I>:".
 <p>
 
+<li><b><code>Attachment comment = &lt;comment&gt;</code></b>
+</br>
+This optional comment is displayed on top of the attachment sumbission section when entering
+a new message. It can contain a sentence like "<I>Please upload your attachments here</I>:".
+<p>
+
 <li><b><code>Menu commands = &lt;list&gt;</code></b>
 </br>
 This option specifies the menu commands displayed on top of a single logbook page. For
diff --git a/doc/wishlist.html b/doc/wishlist.html
index 13d4cb65..d1f90669 100755
--- a/doc/wishlist.html
+++ b/doc/wishlist.html
@@ -43,6 +43,7 @@ starting at the items with the most votes. You can vote for a feature, or sugges
 <tr><td>Require entered attribute must be date, number, alpha, certain length<td>2</tr>
 <tr><td>Search substring in <i>all</i> attributes (not only text body)<td>1</tr>
 <tr><td>Execute shell script on server for email (SMS, pager) notification<td>1</tr>
+<tr><td>Make attributes to display selectable in "Find" page<td>1</tr>
 
 </table></center><p>
 
diff --git a/src/elogd.c b/src/elogd.c
index 076941e8..9a5f9a98 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -6,6 +6,9 @@
   Contents:     Web server program for Electronic Logbook ELOG
 
   $Log$
+  Revision 1.28  2003/02/26 08:17:22  midas
+  Added 'attachment comment'
+
   Revision 1.27  2003/02/24 16:07:43  midas
   Changed mode display with 'show text = 0'
 
@@ -5321,9 +5324,16 @@ time_t now;
           break;
       }
 
+    /* optional attachment comment */
+    if (getcfg(lbs->name, "Attachment comment", comment) && !bedit && !message_id)
+      {
+      rsprintf("<tr><td colspan=2 class=\"attribvalue\">\n");
+      rsputs(comment);
+      rsputs("</td></tr>\n");
+      }
+
     /* field for add attachment */
-    rsprintf("<tr><td nowrap class=\"attribname\">%s %d:</td>\n",  
-             loc("Attachment"), i+1);
+    rsprintf("<tr><td nowrap class=\"attribname\">%s %d:</td>\n", loc("Attachment"), i+1);
     rsprintf("<td class=\"attribvalue\"><input type=\"file\" size=\"60\" maxlength=\"200\" name=\"attfile\" accept=\"filetype/*\">\n");
     rsprintf("&nbsp;&nbsp;<input type=submit name=cmd value=\"%s\">\n", loc("Upload"));
     rsprintf("</td></tr>\n");