Index: openacs-4/packages/forums/lib/message/choose-forum-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose-forum-move.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/forums/lib/message/choose-forum-move.adp	15 Apr 2005 08:05:34 -0000	1.1
+++ openacs-4/packages/forums/lib/message/choose-forum-move.adp	20 Dec 2007 17:29:30 -0000	1.2
@@ -4,14 +4,14 @@
 <p> #forums.Move_thread_to_forum#</p>
   
 <form name="input" action="move"  method="get">
-<input type="hidden" name="message_id" value="@message_id@">
-<input type="hidden" name="confirm_p" value="@confirm_p@">
+<div><input type="hidden" name="message_id" value="@message_id@"></div>
+<div><input type="hidden" name="confirm_p" value="@confirm_p@"></div>
 <if @forums:rowcount@ eq 0>
   <p>#forums.Sorry_you_can_not_move_this_thread_There_are_no_other_forums#
 </if>
 <else>
 <listtemplate name="available_forums"></listtemplate>
 <p></p>
-<input type="submit" value="#forums.Move_thread#">
+<div><input type="submit" value="#forums.Move_thread#"></div>
 </else>
-</form>
\ No newline at end of file
+</form>
Index: openacs-4/packages/forums/lib/message/choose-message-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose-message-move.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/forums/lib/message/choose-message-move.adp	15 Apr 2005 08:05:34 -0000	1.1
+++ openacs-4/packages/forums/lib/message/choose-message-move.adp	20 Dec 2007 17:29:30 -0000	1.2
@@ -4,14 +4,14 @@
 <p> #forums.Move_message_to_message#</p>
   
 <form name="input" action="move-thread" method="get">
-<input type="hidden" name="msg_id" value="@msg_id@">
-<input type="hidden" name="confirm_p" value="@confirm_p@">
+<div><input type="hidden" name="msg_id" value="@msg_id@"></div>
+<div><input type="hidden" name="confirm_p" value="@confirm_p@"></div>
 <if @messages:rowcount@ eq 0 >
     <p>#forums.Sorry_you_can_not_move_this_message_There_are_no_other_threads#</p>    
 </if>
 <else>
 <listtemplate name="available_messages"></listtemplate>
 <p></p>
-<input type="submit" value="#forums.Move_message#">
+<div><input type="submit" value="#forums.Move_message#"></div>
 </else>
-</form>
\ No newline at end of file
+</form>
Index: openacs-4/packages/forums/lib/message/choose-thread-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose-thread-move.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/forums/lib/message/choose-thread-move.adp	15 Apr 2005 08:05:34 -0000	1.1
+++ openacs-4/packages/forums/lib/message/choose-thread-move.adp	20 Dec 2007 17:29:30 -0000	1.2
@@ -4,14 +4,14 @@
 <p> #forums.Move_thread_to_thread#</p>
   
 <form name="input" action="move-thread-thread" method="get">
-<input type="hidden" name="msg_id" value="@msg_id@">
-<input type="hidden" name="confirm_p" value="@confirm_p@">
+<div><input type="hidden" name="msg_id" value="@msg_id@"></div>
+<div><input type="hidden" name="confirm_p" value="@confirm_p@"></div>
 <if @messages:rowcount@ eq 0>
-    #forums.Sorry_you_can_not_move_this_thread_There_are_no_more_threads#
+    <p>#forums.Sorry_you_can_not_move_this_thread_There_are_no_more_threads#</p>
 </if>
 <else>
 <listtemplate name="available_messages"></listtemplate>
 <p></p>
-<input type="submit" value="#forums.Move_thread#">
+<div><input type="submit" value="#forums.Move_thread#"></div>
 </else>
-</form>
\ No newline at end of file
+</form>
Index: openacs-4/packages/forums/lib/message/row.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/row.adp,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/forums/lib/message/row.adp	5 Jun 2007 17:33:50 -0000	1.13
+++ openacs-4/packages/forums/lib/message/row.adp	20 Dec 2007 17:29:30 -0000	1.14
@@ -29,7 +29,7 @@
     </if>
     <div class="details">
   <div style="float: left; padding-right: 4px;">
-    <a id="toggle@message.message_id@" class="dynexpanded" href="javascript:void(toggle(@message.message_id@))"><img src="/resources/forums/Collapse16.gif" width="16" height="16" alt="+" /></a>
+    <a id="toggle@message.message_id@" class="dynexpanded" href="javascript:void(toggle(@message.message_id@))"><img src="/resources/forums/Collapse16.gif" width="16" height="16" alt="+"></a>
   </div>
   <if @display_subject_p@ true>
     <if @preview@ nil>
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 -N -r1.34 -r1.35
--- openacs-4/packages/forums/www/forum-view.adp	22 May 2007 09:42:09 -0000	1.34
+++ openacs-4/packages/forums/www/forum-view.adp	20 Dec 2007 17:29:31 -0000	1.35
@@ -7,16 +7,15 @@
 <if @searchbox_p@ true>
 <div style="float: right;">
   <formtemplate id="search">
-    <formwidget id="forum_id">
-      <label for="search_text">#forums.Search_colon#&nbsp;
-    <formwidget id="search_text">
-	</label>	
+    <div><formwidget id="forum_id"></div>
+      <div><label for="search_text">#forums.Search_colon#&nbsp;</label></div>
+    <div><formwidget id="search_text"></div>
   </formtemplate>
 </div>
 </if>
+
 <p>
 @notification_chunk;noquote@
 </p>
 
 <include src="/packages/forums/lib/message/threads-chunk" forum_id="@forum_id@" flush_p="@flush_p@" &="permissions" moderate_p="@permissions.moderate_p@" orderby="@orderby@" &="page" admin_p="@permissions.admin_p@">
-