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.3 -r1.4
--- openacs-4/packages/acs-mail-lite/lib/email.tcl	21 Jun 2005 17:27:28 -0000	1.3
+++ openacs-4/packages/acs-mail-lite/lib/email.tcl	21 Jun 2005 17:33:26 -0000	1.4
@@ -77,7 +77,7 @@
 	
 	set package_id [ad_conn package_id]
 
-	set revision_id [template::util::file::store_for_party -package_id $package_id -upload_file $upload_file -party_id $party_id]
+	set revision_id [content::item::upload_file -package_id $package_id -upload_file $upload_file -parent_id $party_id]
 
 	if {[exists_and_not_null revision_id]} {
 	    if {[exists_and_not_null file_ids]} {
@@ -113,9 +113,16 @@
 
 	template::multirow foreach messages {
 	    if {[exists_and_not_null file_ids]} {
-		acs_mail_lite::complex_send -to_addr $to_addr -from_addr "$from_addr" -subject "$subject" -body "$content" -package_id $package_id -file_ids $file_ids
+		acs_mail_lite::complex_send -to_addr $to_addr -from_addr "$from_addr" -subject "$subject" -body "$content" -package_id $package_id -file_ids $file_ids -mime_type $mime_type
 	    } else {
-		acs_mail_lite::send -to_addr $to_addr -from_addr "$from_addr" -subject "$subject" -body "$content" -package_id $package_id
+
+		# acs_mail_lite does not know about sending the
+		# correct mime types....
+		if {$mime_type == "text/html"} {
+		    acs_mail_lite::complex_send -to_addr $to_addr -from_addr "$from_addr" -subject "$subject" -body "$content" -package_id $package_id -mime_type $mime_type
+		} else {
+		    acs_mail_lite::send -to_addr $to_addr -from_addr "$from_addr" -subject "$subject" -body "$content" -package_id $package_id
+		}
 	    }
 	}
 
Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	15 Jun 2005 22:13:01 -0000	1.22
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	21 Jun 2005 17:33:26 -0000	1.23
@@ -804,7 +804,7 @@
 		lappend tokens [mime::initialize -param [list name "[ad_quotehtml $title]"] -canonical $mime_type -file "[cr_fs_path]$filename"]
 		lappend file_ids $revision_id
 	    }
-	} else {
+	} elseif {[exists_and_not_null file_ids]} {
 	    
 	    db_foreach get_file_info "select r.mime_type,r.title, r.content as filename
 	    from cr_revisions r
@@ -822,7 +822,7 @@
 	mime::finalize $multi_token -subordinates all
 	set message_id [generate_message_id]
 
-	sendmail -from_addr $from_addr -sendlist [get_address_array -addresses $to_addr] -msg $packaged -valid_email_p t -message_id $message_id -package_id $package_id
+	acs_mail_lite::sendmail -from_addr $from_addr -sendlist [get_address_array -addresses $to_addr] -msg $packaged -valid_email_p t -message_id $message_id -package_id $package_id
 	
 	if {[empty_string_p $package_id]} {
 	    set package_id [apm_package_id_from_key "acs-mail-lite"]