Index: openacs-4/packages/contacts/contacts.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v
diff -u -r1.92 -r1.93
--- openacs-4/packages/contacts/contacts.info	27 Jun 2007 23:55:35 -0000	1.92
+++ openacs-4/packages/contacts/contacts.info	30 Jun 2007 06:59:59 -0000	1.93
@@ -13,6 +13,7 @@
         <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>
+        <package_instance_name>#contacts.Contacts#</package_instance_name>
 
         <provides url="contacts" version="1.2b31"/>
         <requires url="acs-datetime" version="4.1"/>
Index: openacs-4/packages/contacts/lib/email-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/email-search.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/lib/email-search.tcl	27 Jun 2007 23:55:36 -0000	1.2
+++ openacs-4/packages/contacts/lib/email-search.tcl	30 Jun 2007 06:59:59 -0000	1.3
@@ -362,11 +362,12 @@
 		    set last_name ""
 		}
 		
-		
+	        set username [db_string user "select username from users where user_id = :party_id" -default ""]
+
 		set date [lc_time_fmt [dt_sysdate] "%q"]
 		
 		set values [list]
-		foreach element [list first_names last_name salutation name date] {
+		foreach element [list first_names last_name salutation name date username] {
 		    lappend values [list "{$element}" [set $element]]
 		}
 		
Index: openacs-4/packages/contacts/lib/email.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/email.tcl,v
diff -u -r1.35 -r1.36
--- openacs-4/packages/contacts/lib/email.tcl	25 Jun 2007 16:25:39 -0000	1.35
+++ openacs-4/packages/contacts/lib/email.tcl	30 Jun 2007 06:59:59 -0000	1.36
@@ -296,11 +296,11 @@
 		set last_name ""
 	    }
 
-	    
+	    set username [db_string user "select username from users where user_id = :party_id" -default ""]
 	    set date [lc_time_fmt [dt_sysdate] "%q"]
 	    
 	    set values [list]
-	    foreach element [list first_names last_name salutation name date] {
+	    foreach element [list first_names last_name salutation name date username] {
 		lappend values [list "{$element}" [set $element]]
 	    }