Index: openacs-4/packages/forums/lib/message/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums/lib/message/delete.adp	15 Mar 2005 20:06:44 -0000	1.2
+++ openacs-4/packages/forums/lib/message/delete.adp	4 Jan 2008 17:27:47 -0000	1.3
@@ -6,7 +6,7 @@
 
   <div class="action-list">
     <ul>
-      <li><a href="message-delete?@url_vars@&confirm_p=1" class="button">#forums.Yes#</a></li>
+      <li><a href="@confirm_url@" class="button">#forums.Yes#</a></li>
       <li><a href="@return_url@?message_id=@message.message_id@" class="button">#forums.No#</a></li>
     </ul>
   </div>
Index: openacs-4/packages/forums/lib/message/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums/lib/message/delete.tcl	15 Mar 2005 20:06:44 -0000	1.2
+++ openacs-4/packages/forums/lib/message/delete.tcl	4 Jan 2008 17:27:47 -0000	1.3
@@ -24,7 +24,7 @@
 
 set message(tree_level) 0
 
-set url_vars [export_url_vars message_id return_url]
+set confirm_url [export_vars -base "message-delete" {message_id return_url {confirm_p 1}}]
 
 if {[exists_and_not_null alt_template]} {
   ad_return_template $alt_template
Index: openacs-4/packages/forums/www/moderate/message-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-delete.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/forums/www/moderate/message-delete.tcl	13 Dec 2007 14:22:55 -0000	1.12
+++ openacs-4/packages/forums/www/moderate/message-delete.tcl	4 Jan 2008 17:27:47 -0000	1.13
@@ -20,10 +20,10 @@
 
 set dynamic_script "
   <!--
-  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>';
+  collapse_symbol = '<img src=\"/resources/forums/Collapse16.gif\" width=\"16\" height=\"16\" ALT=\"collapse message\" style=\"border:0\" title=\"collapse message\">';
+  expand_symbol = '<img src=\"/resources/forums/Expand16.gif\" width=\"16\" height=\"16\" ALT=\"expand message\" style=\"border:0\" title=\"expand message\">';
+  loading_symbol = '<img src=\"/resources/forums/dyn_wait.gif\" width=\"12\" height=\"16\" ALT=\"x\" style=\"border:0\">';
+  loading_message = 'Loading...';
   rootdir = 'messages-get';
   sid = '$message(root_message_id)';
   //-->
Index: openacs-4/packages/forums-portlet/www/forums-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/forums-portlet/www/forums-portlet.tcl	22 May 2007 09:42:09 -0000	1.14
+++ openacs-4/packages/forums-portlet/www/forums-portlet.tcl	4 Jan 2008 17:30:38 -0000	1.15
@@ -53,7 +53,7 @@
     item {
         label ""
         display_template {
-        <b>@forums.parent_name@</b><br/>
+        <b>@forums.parent_name@</b><br>
           <group column="package_id">
 					<if @useReadingInfo@>
 		<if  @forums.count_unread@ gt 0>
@@ -68,11 +68,11 @@
               <if @forums.new_p@ eq t>
 	        &raquo; <a href="@forums.url@forum-view?forum_id=@forums.forum_id@">@forums.name@</a>
                 <span class="new_flag">
-                  #forums-portlet.resources_acs-subsite_new_gif#<br/>
+                  #forums-portlet.resources_acs-subsite_new_gif#<br>
                 </span>
               </if>
               <else>
-	        &raquo; <a href="@forums.url@forum-view?forum_id=@forums.forum_id@">@forums.name@</a><br/>
+	        &raquo; <a href="@forums.url@forum-view?forum_id=@forums.forum_id@">@forums.name@</a><br>
 	      </else>
 		</else>