Index: openacs-4/packages/contacts/www/message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/contacts/www/message.adp	17 Jun 2005 08:24:36 -0000	1.6
+++ openacs-4/packages/contacts/www/message.adp	20 Jun 2005 15:34:11 -0000	1.7
@@ -18,7 +18,7 @@
   </if>
   <else>
     
-    <include src="/packages/contacts/lib/@message_type@" return_url="@return_url@" party_ids="@party_ids@" file_ids="@file_ids@" subject="@subject@" content="@content@">
+    <include src="/packages/contacts/lib/@message_type@" return_url="@return_url@" party_ids="@party_ids@" file_ids="@file_ids@" subject="@subject@" content="@content@" signature_id="@signature_id@">
   </else>
 </if>
 <include src="/packages/mail-tracking/lib/messages" recipient_id="@party_id@">
Index: openacs-4/packages/contacts/www/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/contacts/www/message.tcl	16 Jun 2005 23:31:17 -0000	1.6
+++ openacs-4/packages/contacts/www/message.tcl	20 Jun 2005 15:34:11 -0000	1.7
@@ -14,7 +14,8 @@
     {object_id:integer,multiple,optional}
     {file_ids ""}
     {subject ""}
-    {content ""}
+    {content:html ""}
+    {signature_id:integer ""}
 } -validate {
     valid_message_type -requires {message_type} {
 	if { [lsearch [list email letter label] $message_type] < 0 } {
@@ -36,7 +37,6 @@
 
 set party_count [llength $party_ids]
 
-
 set title "[_ contacts.Messages]"
 set user_id [ad_conn user_id]
 set context [list $title]
@@ -94,25 +94,39 @@
 set context [list $title]
 
 if { [string is false [exists_and_not_null message]] } {
+    set signature_list [db_list_of_lists signatures "select title,signature_id
+      from contact_signatures
+     where party_id = :user_id
+     order by default_p, upper(title), upper(signature)"]
     append form_elements {
-	{message:text(select) {label "[_ contacts.Message]"} {options {{{-- Create New Message --} new}}}}
-    }
-    set edit_buttons [list [list "[_ contacts.Next]" create]]
-
-    ad_form -action message \
-	-name message \
-	-cancel_label "[_ contacts.Cancel]" \
-	-cancel_url $return_url \
-	-edit_buttons $edit_buttons \
-	-form $form_elements \
-	-on_request {
-	} -new_request {
-	} -edit_request {
-	} -on_submit {
+	{message:text(select) 
+	    {label "[_ contacts.Message]"} 
+	    {options {{{-- Create New Message --} new}}}
 	}
+	{signature_id:text(select) 
+	    {label "[_ contacts.Signature]"}
+	    {options {$signature_list}}
+	}
+    }
+    
 }
 
+set edit_buttons [list [list "[_ contacts.Next]" create]]
 
+ad_form -action message \
+    -name message \
+    -cancel_label "[_ contacts.Cancel]" \
+    -cancel_url $return_url \
+    -edit_buttons $edit_buttons \
+    -form $form_elements \
+    -on_request {
+    } -new_request {
+    } -edit_request {
+    } -on_submit {
+    }
+
+
+
 if { [exists_and_not_null include_signature] } {
     # we had good input
     switch $message_type {