Index: openacs-4/packages/mail-tracking/mail-tracking.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/mail-tracking/mail-tracking.info,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/mail-tracking/mail-tracking.info	19 Dec 2006 10:56:37 -0000	1.9
+++ openacs-4/packages/mail-tracking/mail-tracking.info	21 Dec 2006 07:14:15 -0000	1.10
@@ -19,7 +19,6 @@
         <maturity>0</maturity>
 
         <provides url="mail-tracking" version="0.6.4"/>
-	<requires url="file-storage" version="5.3.0d1"/>
         <callbacks>
         </callbacks>
         <parameters>
Index: openacs-4/packages/mail-tracking/lib/messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/mail-tracking/lib/messages.tcl,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/mail-tracking/lib/messages.tcl	18 Dec 2006 19:16:37 -0000	1.31
+++ openacs-4/packages/mail-tracking/lib/messages.tcl	21 Dec 2006 07:14:15 -0000	1.32
@@ -112,7 +112,7 @@
 		 } 
 	    ]
 
-if { [apm_package_installed_p organizations] && [exists_and_not_null recipient]} {
+if { [apm_package_installed_p contacts] && [exists_and_not_null recipient]} {
     set org_p [organization::organization_p -party_id $recipient] 
     if { $org_p } {
 	lappend filters emp_mail_f {
@@ -215,17 +215,20 @@
 
 db_multirow -extend { file_ids object_url sender_name recipient package_name package_url url_message_id download_files} messages select_messages { } {
 
-    if {$sender_id eq ""} {
-	set sender_name "" 
-    } else {
+    if { [apm_package_installed_p contacts] && [exists_and_not_null sender_id]} { 
 	set sender_name "<a href=\"[contact::url -party_id $sender_id -package_id [contact::package_id -party_id $sender_id]]\">[party::name -party_id $sender_id]</a>"
+    } else {
+	set sender_name "" 
     }
 
     set reciever_list [list]
     set reciever_list2 [db_list get_recievers {select recipient_id from acs_mail_log_recipient_map where type ='to' and log_id = :log_id and recipient_id is not null}] 
 
     foreach recipient_id $reciever_list2 {
+    if { [apm_package_installed_p contacts] } { 
 	lappend reciever_list "<a href=\"[contact::url -party_id $recipient_id -package_id [contact::package_id -party_id $recipient_id]]\">[party::name -party_id $recipient_id]</a>"
+    } else {
+	lappend reciever_list "[party::name -party_id $recipient_id]</a>"
     }
 
     set recipient [join $reciever_list "<br>"]
Index: openacs-4/packages/mail-tracking/sql/postgresql/mail-tracking-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/mail-tracking/sql/postgresql/mail-tracking-create.sql,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/mail-tracking/sql/postgresql/mail-tracking-create.sql	20 Dec 2006 19:19:27 -0000	1.9
+++ openacs-4/packages/mail-tracking/sql/postgresql/mail-tracking-create.sql	21 Dec 2006 07:14:16 -0000	1.10
@@ -17,9 +17,9 @@
 
 create table acs_mail_log (
 	
-	log_id			integer primary key
-				constraint acs_mail_log_object_id_fk
-				references acs_objects(object_id),
+	log_id			integer
+	                        constraint acs_mail_log_log_id_pk
+				primary key,
 	message_id		varchar(300),
 	-- object_id of the object that triggered the sending of the email
 	object_id		integer