Index: openacs-4/packages/acs-lang/www/admin/batch-editor.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/batch-editor.tcl,v
diff -u -N -r1.6 -r1.6.6.1
--- openacs-4/packages/acs-lang/www/admin/batch-editor.tcl	26 Feb 2005 16:00:10 -0000	1.6
+++ openacs-4/packages/acs-lang/www/admin/batch-editor.tcl	5 Mar 2007 11:58:06 -0000	1.6.6.1
@@ -151,17 +151,25 @@
 
 
 set count $page_start
+array set sections {}
 db_foreach get_messages {} {
     ad_form -extend -name batch_editor -form \
         [list [list "message_key_$count:text(hidden)" {value $message_key}]]
     
     set message_url "edit-localized-message?[export_vars { locale package_key message_key show }]"
 
+	# Adding section
+	set section_name "$package_key.$message_key"
+	if { ![info exists sections($section_name)] } {
+		set sec [list "-section" $section_name {legendtext "$section_name"}]
+		ad_form -extend -name batch_editor -form [list $sec]
+		set sections($section_name) "$section_name"
+	}
+
     ad_form -extend -name batch_editor -form \
         [list [list "message_key_pretty_$count:text(inform)" \
                    {label "Message Key"} \
-                   {value "<a href=\"$message_url\">$package_key.$message_key</a>"} \
-                   {section "$package_key.$message_key"}]]
+                   {value "<a href=\"$message_url\">$package_key.$message_key</a>"}]]
     
     if { ![empty_string_p $description] } {
         set description_edit_url "edit-description?[export_vars { locale package_key message_key show }]"
Index: openacs-4/packages/acs-mail-lite/lib/email.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/lib/Attic/email.tcl,v
diff -u -N -r1.16 -r1.16.6.1
--- openacs-4/packages/acs-mail-lite/lib/email.tcl	24 Oct 2005 15:27:59 -0000	1.16
+++ openacs-4/packages/acs-mail-lite/lib/email.tcl	5 Mar 2007 11:58:06 -0000	1.16.6.1
@@ -56,17 +56,18 @@
 	no_callback_p:text(hidden)
 	title:text(hidden),optional
 	{message_type:text(hidden) {value "email"}}
+    {-section "recipients" {legendtext "[_ acs-mail-lite.Recipients]"}}
 	{to:text(checkbox),multiple 
 	    {label "[_ acs-mail-lite.Recipients]"} 
 	    {options  $recipients }
 	    {html {checked 1}}
-	    {section "[_ acs-mail-lite.Recipients]"}
 	}
 	{cc:text(text),optional
 	    {label "[_ acs-mail-lite.CC]:"} 
 	    {html {size 56}}
 	    {help_text "[_ acs-mail-lite.cc_help]"}
 	}
+    {-section ""}
     }
 } else {
     set form_elements {
@@ -75,17 +76,18 @@
 	no_callback_p:text(hidden)
 	title:text(hidden),optional
 	{message_type:text(hidden) {value "email"}}
+    {-section "recipients" {legendtext "[_ acs-mail-lite.Recipients]"}}
 	{check_uncheck:text(checkbox),multiple,optional
 	    {label "[_ acs-mail-lite.check_uncheck]"}
 	    {options {{"" 1}}}
-	    {section "[_ acs-mail-lite.Recipients]"}
 	    {html {onclick check_uncheck_boxes(this.checked)}}
 	}
 	{to:text(checkbox),multiple 
 	    {label "[_ acs-mail-lite.Recipients]"} 
 	    {options  $recipients }
 	    {html {checked 1}}
 	}
+    {-section ""}
     }
 }
 
@@ -125,10 +127,10 @@
 set content_list [list $content $mime_type]
 
 append form_elements {
+	{-section "message" {legendtext "[_ acs-mail-lite.Message]"}}
     {subject:text(text),optional
 	{label "[_ acs-mail-lite.Subject]"}
 	{html {size 55}}
-	{section "[_ acs-mail-lite.Message]"}
     }
     {content_body:text(richtext),optional
 	{label "[_ acs-mail-lite.Message]"}
@@ -138,6 +140,7 @@
     {upload_file:file(file),optional
 	{label "[_ acs-mail-lite.Upload_file]"}
     }
+	{-section ""}
 }
 
 if { [exists_and_not_null item_id] } {