Index: openacs-4/packages/contacts/www/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/contacts/www/message.tcl	7 Oct 2005 21:15:00 -0000	1.17
+++ openacs-4/packages/contacts/www/message.tcl	16 Oct 2005 12:47:50 -0000	1.18
@@ -5,32 +5,28 @@
     @creation-date 2004-07-28
     @cvs-id $Id$
 } {
+    {object_id:integer,multiple,optional}
     {party_id:integer,multiple,optional}
     {party_ids:optional}
     {message_type ""}
     {message:optional}
     {header_id:integer ""}
     {footer_id:integer ""}
     {return_url "./"}
-    {object_id:integer,multiple,optional}
     {file_ids ""}
     {item_id:integer ""}
     {folder_id:integer ""}
     {signature_id:integer ""}
     {subject ""}
     {content_body:html ""}
     {to:integer,multiple,optional ""}
+    {context_id:integer ""}
 } -validate {
     valid_message_type -requires {message_type} {
 	if { [lsearch [list email letter] $message_type] < 0 } {
 	    ad_complain "[_ contacts.lt_Your_provided_an_inva]"
 	}
     }
-    valid_party_submission {
-	if { ![exists_and_not_null party_id] && ![exists_and_not_null party_ids] } { 
-	    ad_complain "[_ contacts.lt_Your_need_to_provide_]"
-	}
-    }
 }
 
 
@@ -46,6 +42,13 @@
     }
 }
 
+if { [exists_and_not_null to] } {
+    set party_ids [list]
+    foreach party_id $to {
+	lappend party_ids $party_id
+    }
+}
+
 set party_count [llength $party_ids]
 set title "[_ contacts.Messages]"
 set user_id [ad_conn user_id]
@@ -166,13 +169,20 @@
 		lappend file_list $revision_id
 	    }
 	} else {
-	    lappend file_list $object
+	    set revision_id [content::item::get_best_revision -item_id $object]
+	    if {[empty_string_p $revision_id]} {
+		# so already is a revision
+		lappend file_list $object
+	    } else {
+		# append revision of content item
+		lappend file_list $revision_id
+	    }
 	}
     }
 }
 
 if {[exists_and_not_null file_list]} {
-    set file_ids [join $file_list ","]
+    set file_ids [join $file_list " "]
 }
 
 set form_elements {