Index: openacs-4/packages/contacts/lib/email.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/email.tcl,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/contacts/lib/email.tcl	18 May 2006 18:02:59 -0000	1.27
+++ openacs-4/packages/contacts/lib/email.tcl	12 Jun 2006 07:57:08 -0000	1.28
@@ -11,7 +11,7 @@
     }
 }
 
-foreach optional_param {return_url content export_vars file_ids object_id cc bcc item_id} {
+foreach optional_param {return_url content export_vars file_ids cc bcc item_id context_id} {
     if {![info exists $optional_param]} {
 	set $optional_param {}
     }
@@ -25,11 +25,6 @@
     set no_callback_p f
 }
 
-if {[exists_and_not_null context_id]} {
-    set object_id $context_id
-}
-
-ns_log Notice "MY CONTEXT:: $context_id MY OBJECT $object_id"
 # Somehow when the form is submited the party_ids values became
 # only one element of a list, this avoid that problem
 
@@ -134,6 +129,7 @@
 
     append form_elements {
         {file_ids:text(hidden) {value $file_ids}}
+        {context_id:text(hidden) {value $context_id}}
         {files:text(inform),optional {label "[_ acs-mail-lite.Associated_files]"} {value $files}}
     }
 }
@@ -167,7 +163,6 @@
     {upload_file:file(file),optional
 	{label "[_ contacts.Upload_file]"}
     }
-    {object_id:integer(hidden),optional}
 }
 
 if { [exists_and_not_null item_id] } {
@@ -296,7 +291,7 @@
 		-package_id $package_id \
 		-file_ids $file_ids \
 		-mime_type $mime_type \
-		-object_id $object_id \
+		-object_id $context_id \
 		-no_callback_p $no_callback_p \
 		-single_email
 	    
@@ -335,7 +330,7 @@
 		-package_id $package_id \
 		-file_ids $file_ids \
 		-mime_type $mime_type \
-		-object_id $object_id \
+		-object_id $context_id \
 		-no_callback_p $no_callback_p \
 		-single_email
 	}
Index: openacs-4/packages/contacts/lib/fax.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/fax.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/fax.tcl	15 May 2006 14:32:20 -0000	1.1
+++ openacs-4/packages/contacts/lib/fax.tcl	12 Jun 2006 07:57:08 -0000	1.2
@@ -40,8 +40,6 @@
 }
 
 set template_path "[acs_root_dir][parameter::get_from_package_key -package_key contacts -parameter OOMailingPath]"
-set banner_options [util::find_all_files -extension jpg -path "${template_path}/banner"]
-set banner_options [concat [list ""] $banner_options]
 set template_path "[acs_root_dir]/templates/pdf/fax"
 
 set date [split [dt_sysdate] "-"]
@@ -54,12 +52,6 @@
     {recipients:text(inform)
 	{label "[_ contacts.Recipients]"}
     }
-    {banner:text(select),optional
-        {label "[_ contacts.Banner]"} 
-        {help_text "[_ contacts.Banner_help_text]"}
-	{options $banner_options}
-	{section "[_ contacts.oo_message]"}
-    }
     {subject:text(text),optional
 	{label "[_ contacts.Subject]"}
 	{html {size 55}}
@@ -70,6 +62,11 @@
 	{html {cols 70 rows 24}}
 	{help_text {[_ contacts.fax_content_help]}}
     }
+    {pages:integer(text),optional
+	{label "[_ contacts.fax_pages]"}
+	{html {cols 70 rows 24}}
+	{help_text {[_ contacts.fax_pages_help]}}
+    }
     {account_manager_p:text(select)
 	{label "[_ contacts.Account_Manager_P]"}
 	{help_text "[_ contacts.Account_Manager_P_help_text]"}
@@ -94,7 +91,6 @@
 			    ]
 	    set content [list $content $message_info(content_format)]
 	    set title $message_info(title)
-            set banner $message_info(banner)
 	} else {
 	    if { [exists_and_not_null signature] } {
 		set content [list $signature "text/html"]