Index: openacs-4/packages/contacts/contacts.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v
diff -u -r1.89 -r1.90
--- openacs-4/packages/contacts/contacts.info	2 Feb 2007 11:24:56 -0000	1.89
+++ openacs-4/packages/contacts/contacts.info	25 Jun 2007 17:29:23 -0000	1.90
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="1.2b28" url="http://openacs.org/repository/download/apm/contacts-1.2b28.apm">
+    <version name="1.2b29" url="http://openacs.org/repository/download/apm/contacts-1.2b29.apm">
         <owner url="mailto:openacs@geddert.com">Matthew Geddert</owner>
         <summary>This application lets you collaboratively view, edit and categorize contacts.</summary>
         <release-date>2006-06-25</release-date>
         <description format="text/plain">Contacts is an application for managing all those people and or organization you need to keep track of. It has a complete UI for storing and categorizing contacts. Each contact can have an arbitrary number of custom attributes associated with it, including other contacts (i.e. a certain contact &quot;belongs&quot; to a certain organization). It also functions as a service contract provider for attributes related to users in your system</description>
         <maturity>0</maturity>
 
-        <provides url="contacts" version="1.2b28"/>
+        <provides url="contacts" version="1.2b29"/>
         <requires url="acs-datetime" version="4.1"/>
         <requires url="acs-events" version="0.5d3"/>
         <requires url="acs-tcl" version="5.3.0d2"/>
Index: openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml,v
diff -u -r1.96 -r1.97
--- openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	21 Jun 2007 20:06:41 -0000	1.96
+++ openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	25 Jun 2007 17:29:23 -0000	1.97
@@ -513,7 +513,7 @@
   <msg key="lt_zippostal_does_not_st">zip/postal does not start with -&gt;</msg>
   <msg key="lt_zippostal_starts_with">zip/postal starts with -&gt;</msg>
   <msg key="Mail">Mail</msg>
-  <msg key="Mail_group">Mail %group%</msg>
+  <msg key="Mail_group">Message to %recipient%</msg>
   <msg key="Mail_Merge">Mail Merge</msg>
   <msg key="Mail_Merge_Results">Mail Merge Results</msg>
   <msg key="Mail_through_p">Mail Through</msg>
Index: openacs-4/packages/contacts/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/index.tcl,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/contacts/www/index.tcl	25 Jun 2007 16:25:39 -0000	1.29
+++ openacs-4/packages/contacts/www/index.tcl	25 Jun 2007 17:29:24 -0000	1.30
@@ -117,7 +117,13 @@
 }
 
 if { $search_id ne "" && $contacts_total_count > 0 } {
-    set label [_ contacts.Mail_group]
+    if {[contact::group::mapped_p -group_id $search_id]} {
+	set recipient "[group::title -group_id $search_id]"
+    } else {
+	set recipient "[contact::search::title -search_id $search_id]"
+    }
+    set label "[_ contacts.Mail_group]"
+
     append form_elements {
 	{mail_merge_group:text(submit) {label $label} {value "1"}}
     }