Index: openacs-4/packages/contacts/lib/email.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/email.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/contacts/lib/email.tcl	1 Jul 2005 00:33:46 -0000	1.6
+++ openacs-4/packages/contacts/lib/email.tcl	1 Jul 2005 00:44:30 -0000	1.7
@@ -46,8 +46,14 @@
 	{html {cols 55 rows 18}}
 	{help_text {remember that you can use <a href="message-help">mail merge substitutions</a>. the most common wildcards are \{name\} \{first_names\}, \{last_name\}, \{home_address\} and \{date\}}}
     }
-    {upload_file:file(file),optional
-	{label "[_ contacts.Upload_File]"}
+
+}
+
+if { [parameter::get -boolean -parameter "EmailAttachmentsAllowed" -default "1"] } {
+    append form_elements {
+	{upload_file:file(file),optional
+	    {label "[_ contacts.Upload_File]"}
+	}
     }
 }
 
@@ -86,7 +92,11 @@
 	template::multirow create messages message_type to_addr subject content party_id title to
 
 	# Insert the uploaded file linked under the package_id
-	set filename [template::util::file::get_property filename $upload_file]
+	if { [parameter::get -boolean -parameter "EmailAttachmentsAllowed" -default "1"] } {
+	    set filename [template::util::file::get_property filename $upload_file]
+	} else {
+	    set filename ""
+	}
 	set package_id [ad_conn package_id]
 
 	if {$filename != "" } {