Index: openacs-4/packages/contacts/www/message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/contacts/www/message.adp	20 Jun 2005 15:34:11 -0000	1.7
+++ openacs-4/packages/contacts/www/message.adp	28 Jun 2005 23:53:35 -0000	1.8
@@ -18,7 +18,18 @@
   </if>
   <else>
     
-    <include src="/packages/contacts/lib/@message_type@" return_url="@return_url@" party_ids="@party_ids@" file_ids="@file_ids@" subject="@subject@" content="@content@" signature_id="@signature_id@">
+    <include 
+        src=/packages/contacts/lib/@message_type@
+        return_url=@return_url@ 
+        party_ids=@party_ids@ 
+        file_ids=@file_ids@ 
+        subject=@subject@ 
+        content=@content@ 
+        signature_id=@signature_id@ 
+        recipients=@recipients;noquote@
+        >
   </else>
 </if>
-<include src="/packages/mail-tracking/lib/messages" recipient_id="@party_id@">
+<if @party_count@ eq 1>
+    <include src="/packages/mail-tracking/lib/messages" recipient_id="@party_id@">
+</if>