Index: openacs-4/packages/contacts/lib/contact-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-master.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/contacts/lib/contact-master.tcl	13 Sep 2005 15:35:57 -0000	1.13
+++ openacs-4/packages/contacts/lib/contact-master.tcl	23 Oct 2005 10:47:08 -0000	1.14
@@ -3,7 +3,7 @@
 #    @cvs-id $Id$
 
 
-set contact_master_template [parameter::get -parameter "ContactMaster" -default "/packages/contacts/lib/contact-master"]
+set contact_master_template [parameter::get_from_package_key -package_key "contacts" -parameter "ContactMaster" -default "/packages/contacts/lib/contact-master"]
 if { $contact_master_template != "/packages/contacts/lib/contact-master" } {
     ad_return_template
 }
Index: openacs-4/packages/contacts/lib/contacts-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts-master.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/contacts/lib/contacts-master.tcl	30 Jun 2005 00:06:11 -0000	1.9
+++ openacs-4/packages/contacts/lib/contacts-master.tcl	23 Oct 2005 10:47:08 -0000	1.10
@@ -3,7 +3,7 @@
 #    @cvs-id $Id$
 
 
-set contacts_master_template [parameter::get -parameter "ContactsMaster" -default "/packages/contacts/lib/contacts-master"]
+set contacts_master_template [parameter::get_from_package_key -package_key "contacts" -parameter "ContactsMaster" -default "/packages/contacts/lib/contacts-master"]
 if { $contacts_master_template != "/packages/contacts/lib/contacts-master" } {
     ad_return_template
 }
Index: openacs-4/packages/contacts/www/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/index.vuh,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/contacts/www/index.vuh	21 Oct 2005 10:55:30 -0000	1.9
+++ openacs-4/packages/contacts/www/index.vuh	23 Oct 2005 10:47:08 -0000	1.10
@@ -18,15 +18,15 @@
 set action [lindex $file_list 1]
 
 
-
 if { $party_is_contact_p } {
         if { [llength $file_list] == "1" } {
                 # we need to redirect the user to their "correct" summary page otherwise
                 # sub links will not work correctly
                 ad_returnredirect "[ad_conn package_url]${party_id}/"
                 ad_script_abort
         }
-        set valid_pages [list "" edit files groups relationships comments message history changes]
+        set valid_pages [list "" edit files groups relationships comments message history changes mail-tracking]
+
         if { [lsearch $valid_pages $action] >= 0 && [llength $file_list] == "2" } {
            switch $action {
                edit          { set file "contact-edit" }
@@ -43,6 +43,7 @@
 	       mail-tracking { set file "mail-tracking" }
                default       { set file [parameter::get -parameter "ContactSummaryViewTemplate" -default "/packages/contacts/www/contact"] }
            }
+
            set form_supplied_party_id [ns_queryget party_id] 
            if { [exists_and_not_null form_supplied_party_id] } {
                 if { $form_supplied_party_id != $party_id } {