Index: openacs-4/packages/contacts/lib/contact-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-master.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/contacts/lib/contact-master.adp	2 Apr 2006 22:10:28 -0000	1.5
+++ openacs-4/packages/contacts/lib/contact-master.adp	22 Jun 2007 05:31:44 -0000	1.6
@@ -1,5 +1,5 @@
 <if @contact_master_template@ eq /packages/contacts/lib/contact-master>
-  <master>
+  <master src=/packages/pi/templates/pi/site-master>
   <property name="title">@title@</property>
   <property name="context">@context@</property>
   <property name="header_stuff">
Index: openacs-4/packages/contacts/lib/contacts-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts-master.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/contacts/lib/contacts-master.adp	14 Jan 2007 15:52:56 -0000	1.5
+++ openacs-4/packages/contacts/lib/contacts-master.adp	22 Jun 2007 05:31:44 -0000	1.6
@@ -1,5 +1,5 @@
 <if @contacts_master_template@ eq /packages/contacts/lib/contacts-master>
-  <master>
+  <master src=/packages/pi/templates/pi/site-master>
   <property name="title">@title@</property>
   <property name="context">@context@</property>
   <property name="header_stuff">
Index: openacs-4/packages/contacts/lib/email.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/email.tcl,v
diff -u -r1.33 -r1.34
--- openacs-4/packages/contacts/lib/email.tcl	6 Feb 2007 11:32:56 -0000	1.33
+++ openacs-4/packages/contacts/lib/email.tcl	22 Jun 2007 05:31:44 -0000	1.34
@@ -45,11 +45,11 @@
 	no_callback_p:text(hidden)
 	title:text(hidden),optional
 	{message_type:text(hidden) {value "email"}}
+	{-section "sec1" {legendtext "[_ contacts.Recipients]"}}
 	{to:text(checkbox),multiple,optional
 	    {label "[_ contacts.Recipients]"} 
 	    {options  $recipients }
 	    {html {checked 1}}
-	    {section "[_ contacts.Recipients]"}
 	}
 	{cc:text(text),optional
 	    {label "[_ contacts.CC]:"} 
@@ -69,10 +69,10 @@
 	no_callback_p:text(hidden)
 	title:text(hidden),optional
 	{message_type:text(hidden) {value "email"}}
+	{-section "sec1" {legendtext "[_ contacts.Recipients]"}}
 	{check_uncheck:text(checkbox),multiple,optional
 	    {label "[_ contacts.check_uncheck]"}
 	    {options {{"" 1}}}
-	    {section "[_ contacts.Recipients]"}
 	    {html {onclick check_uncheck_boxes(this.checked)}}
 	}
 	{to:text(checkbox),multiple,optional
@@ -169,10 +169,10 @@
 set content_list [list $content $mime_type]
 
 append form_elements {
+    {-section "sec2" {legendtext "[_ contacts.Message]"}}
     {subject:text(text),optional
 	{label "[_ contacts.Subject]"}
 	{html {size 60}}
-	{section "[_ contacts.Message]"}
     }
     {content_body:richtext(richtext),optional
 	{label "[_ contacts.Message]"}
@@ -300,7 +300,7 @@
 	    set date [lc_time_fmt [dt_sysdate] "%q"]
 	    
 	    set values [list]
-	    foreach element [list first_names last_name salutation] {
+	    foreach element [list first_names last_name salutation name date] {
 		lappend values [list "{$element}" [set $element]]
 	    }