Index: openacs-4/packages/forums/lib/search/search-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/search/search-chunk.adp,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/forums/lib/search/search-chunk.adp	1 Apr 2004 16:14:29 -0000	1.2
+++ openacs-4/packages/forums/lib/search/search-chunk.adp	3 Nov 2006 22:25:42 -0000	1.2.2.1
@@ -3,7 +3,7 @@
     <tr>
       <td align="right">
 <formtemplate id="search">
-        #forums.Search#&nbsp;<formwidget id="search_text">
+        <label for="search_text">#forums.Search#&nbsp;<formwidget id="search_text"></label>
 </formtemplate>
       </td>
     </tr>
Index: openacs-4/packages/forums/www/forum-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.adp,v
diff -u -r1.29.2.2 -r1.29.2.3
--- openacs-4/packages/forums/www/forum-view.adp	25 Jan 2006 21:02:44 -0000	1.29.2.2
+++ openacs-4/packages/forums/www/forum-view.adp	3 Nov 2006 22:25:43 -0000	1.29.2.3
@@ -8,8 +8,9 @@
 <div style="float: right;">
   <formtemplate id="search">
     <formwidget id="forum_id">
-      #forums.Search_colon#&nbsp;
+      <label for="search_text">#forums.Search_colon#&nbsp;
     <formwidget id="search_text">
+	</label>	
   </formtemplate>
 </div>
 </if>
Index: openacs-4/packages/forums/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/index.adp,v
diff -u -r1.23 -r1.23.2.1
--- openacs-4/packages/forums/www/index.adp	1 Apr 2004 16:14:30 -0000	1.23
+++ openacs-4/packages/forums/www/index.adp	3 Nov 2006 22:25:43 -0000	1.23.2.1
@@ -6,8 +6,9 @@
 <div style="float: right;">
   <formtemplate id="search">
     <formwidget id="forum_id">
-      #forums.Search_colon#&nbsp;
+      <label for="search_text">#forums.Search_colon#&nbsp;
     <formwidget id="search_text">
+	</label>
   </formtemplate>
 </div>
 </if>
Index: openacs-4/packages/forums/www/message-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.adp,v
diff -u -r1.28.2.2 -r1.28.2.3
--- openacs-4/packages/forums/www/message-view.adp	11 Feb 2006 22:07:25 -0000	1.28.2.2
+++ openacs-4/packages/forums/www/message-view.adp	3 Nov 2006 22:25:43 -0000	1.28.2.3
@@ -14,14 +14,15 @@
     <script type="text/javascript" src="/resources/forums/forums.js"></script>
     @dynamic_script;noquote@
   </property>
-  <iframe width="0" height="0" border="0" style="width:0; height:0; border:0;" id="dynamic" name="dynamic" src="about:blank"></iframe>
+  <iframe width="0" height="0" border="0" style="width:0; height:0; border:0;" id="dynamic" name="dynamic" src="about:blank" title="Dynamic frame"></iframe>
 
   <if @searchbox_p@ true>
     <div style="float: right;">
       <formtemplate id="search">
         <formwidget id="forum_id">
-          #forums.Search_colon#&nbsp;
+          <label for="search_text">#forums.Search_colon#&nbsp;
           <formwidget id="search_text">
+	  </label>
       </formtemplate>
     </div>
   </if>
Index: openacs-4/packages/forums/www/message-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.tcl,v
diff -u -r1.32.2.2 -r1.32.2.3
--- openacs-4/packages/forums/www/message-view.tcl	17 Jan 2006 23:02:40 -0000	1.32.2.2
+++ openacs-4/packages/forums/www/message-view.tcl	3 Nov 2006 22:25:43 -0000	1.32.2.3
@@ -98,8 +98,8 @@
   <script type=\"text/javascript\" src=\"/resources/forums/dynamic-comments.js\"></script>
   <script type=\"text/javascript\">
   <!--
-  collapse_symbol = '<img src=\"/resources/forums/Collapse16.gif\" width=\"16\" height=\"16\" ALT=\"-\" border=\"0\" title=\"collapse message\">';
-  expand_symbol = '<img src=\"/resources/forums/Expand16.gif\" width=\"16\" height=\"16\" ALT=\"+\" border=\"0\" title=\"expand message\">';
+  collapse_symbol = '<img src=\"/resources/forums/Collapse16.gif\" width=\"16\" height=\"16\" ALT=\"collapse message\" border=\"0\" title=\"collapse message\">';
+  expand_symbol = '<img src=\"/resources/forums/Expand16.gif\" width=\"16\" height=\"16\" ALT=\"expand message\" border=\"0\" title=\"expand message\">';
   loading_symbol = '<img src=\"/resources/forums/dyn_wait.gif\" width=\"12\" height=\"16\" ALT=\"x\" border=\"0\">';
   loading_message = '<i>Loading...</i>';
   rootdir = 'messages-get';