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 -r1.1 -r1.2
--- openacs-4/packages/acs-mail-lite/lib/email.tcl	21 Jun 2005 06:59:27 -0000	1.1
+++ openacs-4/packages/acs-mail-lite/lib/email.tcl	21 Jun 2005 13:56:23 -0000	1.2
@@ -10,12 +10,16 @@
 	return -code error "$required_param is a required parameter."
     }
 }
-foreach optional_param {return_url content} {
+foreach optional_param {return_url content export_vars} {
     if {![info exists $optional_param]} {
 	set $optional_param {}
     }
 }
 
+if {![info exists mime_type]} {
+    set mime_type "text/plain"
+}
+
 foreach party_id $party_ids {
     lappend recipients "<a href=\"[contact::url -party_id $party_id]\">[contact::name -party_id $party_id]</a>"
 }
@@ -29,21 +33,29 @@
     {to:text(inform),optional {label "[_ contacts.Recipients]"} {value $recipients}}
 }
 
+foreach var $export_vars {
+    upvar $var var_value
+    lappend form_elements [list ${var}:text(hidden) {value $var_value}]
+}
+
+set content_list [list $content $mime_type]
+
 append form_elements {
     {subject:text(text),optional
 	{label "[_ contacts.Subject]"}
 	{html {size 55}}
     }
-    {content:text(textarea),optional
+    {content:text(richtext),optional
 	{label "[_ contacts.Message]"}
 	{html {cols 55 rows 18}}
+	{value $content_list}
     }
     {upload_file:file(file),optional
 	{label "[_ contacts.Upload_File]"}
     }
 }
 
-ad_form -action message \
+ad_form -action [ad_conn url] \
     -html {enctype multipart/form-data} \
     -name email \
     -cancel_label "[_ contacts.Cancel]" \
@@ -55,7 +67,7 @@
     } -edit_request {
     } -on_submit {
 	set from [ad_conn user_id]
-	set from_addr [cc_email_from_party $user_id]
+	set from_addr [cc_email_from_party $from]
 	template::multirow create messages message_type to_addr subject content
 
 	# Insert the uploaded file linked under the package_id
@@ -107,4 +119,4 @@
     } -after_submit {
 	
 	ad_returnredirect $return_url
-    }
\ No newline at end of file
+    }