Index: openacs-4/packages/contacts/www/message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message.adp,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/contacts/www/message.adp	28 Sep 2005 22:14:00 -0000	1.13
+++ openacs-4/packages/contacts/www/message.adp	3 Oct 2005 18:41:59 -0000	1.14
@@ -24,20 +24,33 @@
     <formtemplate id="message"></formtemplate>
   </if>
   <else>
-    <include 
-        src=/packages/contacts/lib/@message_type@
-        return_url=@return_url@ 
-        party_ids=@party_ids@ 
-        file_ids=@file_ids@ 
-	item_id=@item_id@
-        signature_id=@signature_id@ 
-        recipients=@recipients;noquote@
-        footer_id=@footer_id@
-        header_id=@header_id@
-        folder_id=@folder_id@
-        >
+    <if @message_type@ eq "email">
+
+    	<include 	
+        	src=/packages/acs-mail-lite/lib/email
+        	return_url=@return_url@ 
+	        party_ids=@party_ids@ 
+		no_callback_p="f"
+		action="message"
+		signature_id=@signature_id@
+	        >
+	</if>
+	<else>
+    	<include 	
+        	src=/packages/contacts/lib/@message_type@
+        	return_url=@return_url@ 
+	        party_ids=@party_ids@ 
+	        file_ids=@file_ids@ 
+		item_id=@item_id@
+	        signature_id=@signature_id@ 
+	        recipients=@recipients;noquote@
+	        footer_id=@footer_id@
+	        header_id=@header_id@
+	        folder_id=@folder_id@
+	        >
+	</else>
   </else>
 </if>
 <if @party_count@ eq 1>
-    <include src="/packages/mail-tracking/lib/messages" recipient_id="@party_id@">
+   <include src="/packages/mail-tracking/lib/messages" recipient_id="@party_id@">
 </if>
Index: openacs-4/packages/contacts/www/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message.tcl,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/contacts/www/message.tcl	28 Sep 2005 22:14:00 -0000	1.15
+++ openacs-4/packages/contacts/www/message.tcl	3 Oct 2005 18:41:59 -0000	1.16
@@ -17,6 +17,9 @@
     {item_id:integer ""}
     {folder_id:integer ""}
     {signature_id:integer ""}
+    {subject ""}
+    {content_body ""}
+    {to:integer,multiple,optional ""}
 } -validate {
     valid_message_type -requires {message_type} {
 	if { [lsearch [list email letter] $message_type] < 0 } {
@@ -30,6 +33,7 @@
     }
 }
 
+
 if { [exists_and_not_null message] && ![exists_and_not_null message_type] } {
     set message_type [lindex [split $message "."] 0]
     set item_id [lindex [split $message "."] 1]
@@ -176,7 +180,7 @@
     party_ids:text(hidden)
     return_url:text(hidden)
     folder_id:text(hidden)
-    {to:text(inform),optional {label "[_ contacts.Recipients]"} {value $recipients}}
+    {to_name:text(inform),optional {label "[_ contacts.Recipients]"} {value $recipients}}
 }
 
 
@@ -301,3 +305,10 @@
     } -on_submit {
     }
 set party_ids $new_party_ids
+
+if {[exists_and_not_null signature_id]} {
+    set signature [contact::signature::get -signature_id $signature_id]
+} else {
+    set signature ""
+}
+