Index: openacs-4/packages/mail-tracking/lib/messages.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/mail-tracking/lib/messages.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/mail-tracking/lib/messages.xql	17 Mar 2006 10:06:45 -0000	1.7
+++ openacs-4/packages/mail-tracking/lib/messages.xql	14 May 2006 16:11:19 -0000	1.8
@@ -8,7 +8,6 @@
          select 
 		message_id, 
 		sender_id, 
-		recipient_id, 
 		package_id, 
 		sent_date, 
 		body, 
@@ -17,19 +16,17 @@
 		log_id
         from 
 		acs_mail_log
-	where 1=1
-		$recipient_where_clause
-		[template::list::page_where_clause -and -name messages]		
+	where   [template::list::page_where_clause -name messages]		
         	[template::list::filter_where_clauses -and -name messages]
         	[template::list::orderby_clause -orderby -name messages]
         </querytext>
     </fullquery>
 
     <fullquery name="messages_pagination">
         <querytext>
-         select log_id
-        from acs_mail_log
-	where 1=1	
+         select distinct ml.log_id, sent_date
+        from acs_mail_log ml, acs_mail_log_recipient_map mlrm
+	where ml.log_id=mlrm.log_id
 	$recipient_where_clause 
         [template::list::filter_where_clauses -and -name messages]
         [template::list::orderby_clause -orderby -name messages]