Index: openacs-4/packages/acs-messaging/tcl/acs-messaging-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-messaging/tcl/acs-messaging-procs-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-messaging/tcl/acs-messaging-procs-oracle.xql	1 Jun 2001 13:02:40 -0000	1.2
+++ openacs-4/packages/acs-messaging/tcl/acs-messaging-procs-oracle.xql	20 Nov 2017 13:34:01 -0000	1.3
@@ -3,22 +3,6 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="acs_messaging_send_query.insert_messaging_by_query">      
-      <querytext>
-      
-        insert into acs_messages_outgoing
-            (message_id, to_address, grouping_id, wait_until)
-        select :m__message_id, p.email, q.grouping_id,
-               nvl(q.wait_until, SYSDATE) as wait_until
-            from ($query) q, parties p
-            where not exists (select 1 from acs_messages_outgoing o
-                                  where o.message_id = :m__message_id
-                                    and p.email = o.to_address)
-              and p.party_id = q.recipient_id
-    
-      </querytext>
-</fullquery>
-
 <fullquery name="acs_message_p.acs_message_p">      
       <querytext>
       
@@ -28,7 +12,6 @@
     
       </querytext>
 </fullquery>
-
  
 <fullquery name="acs_messaging_first_ancestor.acs_message_first_ancestor">      
       <querytext>
@@ -38,47 +21,4 @@
       </querytext>
 </fullquery>
 
- 
-<fullquery name="acs_messaging_send_query.insert_messaging_by_query">      
-      <querytext>
-      
-        insert into acs_messages_outgoing
-            (message_id, to_address, grouping_id, wait_until)
-        select :m__message_id, p.email, q.grouping_id,
-               nvl(q.wait_until, SYSDATE) as wait_until
-            from ($query) q, parties p
-            where not exists (select 1 from acs_messages_outgoing o
-                                  where o.message_id = :m__message_id
-                                    and p.email = o.to_address)
-              and p.party_id = q.recipient_id
-    
-      </querytext>
-</fullquery>
-
- 
-<fullquery name="acs_messaging_process_queue.acs_message_send">      
-      <querytext>
-      
-        select o.message_id as sending_message_id,
-               o.to_address as recip_email,
-               p.email as sender_email,
-               to_char(m.sent_date, 'Dy, DD Mon YYYY HH24:MI:SS') as sent_date,
-               m.rfc822_id,
-               m.title,
-               m.mime_type,
-               m.content,
-               m2.rfc822_id as in_reply_to
-            from acs_messages_outgoing o,
-                 acs_messages_all m,
-                 acs_messages_all m2,
-                 parties p
-            where o.message_id = m.message_id
-                and m2.message_id(+) = m.reply_to
-                and p.party_id = m.sender
-                and wait_until <= sysdate
-    
-      </querytext>
-</fullquery>
-
- 
 </queryset>
Index: openacs-4/packages/acs-messaging/tcl/acs-messaging-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-messaging/tcl/acs-messaging-procs-postgresql.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-messaging/tcl/acs-messaging-procs-postgresql.xql	12 Jul 2009 01:08:30 -0000	1.6
+++ openacs-4/packages/acs-messaging/tcl/acs-messaging-procs-postgresql.xql	20 Nov 2017 13:34:01 -0000	1.7
@@ -3,23 +3,6 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="acs_messaging_send_query.insert_messaging_by_query">      
-      <querytext>
-      
-        insert into acs_messages_outgoing
-            (message_id, to_address, grouping_id, wait_until)
-        select :m__message_id, p.email, q.grouping_id,
-               coalesce(q.wait_until, current_timestamp) as wait_until
-            from ($query) q, parties p
-            where not exists (select 1 from acs_messages_outgoing o
-                                  where o.message_id = :m__message_id
-                                    and p.email = o.to_address)
-              and p.party_id = q.recipient_id
-    
-      </querytext>
-
-</fullquery>
-
 <fullquery name="acs_message_p.acs_message_p">      
       <querytext>
 	    select acs_message__message_p(:message_id);
@@ -31,27 +14,5 @@
         select acs_message__first_ancestor(:message_id) as ancestor_id 
     </querytext>
 </fullquery>
-
  
-<fullquery name="acs_messaging_process_queue.acs_message_send">      
-      <querytext>
-        select o.message_id as sending_message_id,
-               o.to_address as recip_email,
-               p.email as sender_email,
-               to_char(m.sent_date, 'Dy, DD Mon YYYY HH24:MI:SS') as sent_date,
-               m.rfc822_id,
-               m.title,
-               m.mime_type,
-               m.content,
-               m2.rfc822_id as in_reply_to
-            from acs_messages_outgoing o,
-                 acs_messages_all m left outer join acs_messages_all m2 on (m2.message_id = m.reply_to),
-                 parties p
-            where o.message_id = m.message_id
-                and p.party_id = m.sender
-                and wait_until <= current_timestamp
-      </querytext>
-</fullquery>
-
- 
 </queryset>
Index: openacs-4/packages/acs-messaging/tcl/acs-messaging-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-messaging/tcl/acs-messaging-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-messaging/tcl/acs-messaging-procs.xql	1 Jun 2001 13:02:40 -0000	1.2
+++ openacs-4/packages/acs-messaging/tcl/acs-messaging-procs.xql	20 Nov 2017 13:34:01 -0000	1.3
@@ -11,5 +11,41 @@
       </querytext>
 </fullquery>
 
+<fullquery name="acs_messaging_send_query.insert_messaging_by_query">      
+      <querytext>
+      
+        insert into acs_messages_outgoing
+            (message_id, to_address, grouping_id, wait_until)
+        select :m__message_id, p.email, q.grouping_id,
+               coalesce(q.wait_until, current_timestamp) as wait_until
+            from ($query) q, parties p
+            where not exists (select 1 from acs_messages_outgoing o
+                                  where o.message_id = :m__message_id
+                                    and p.email = o.to_address)
+              and p.party_id = q.recipient_id
+    
+      </querytext>
+
+</fullquery>
+
+<fullquery name="acs_messaging_process_queue.acs_message_send">      
+      <querytext>
+        select o.message_id as sending_message_id,
+               o.to_address as recip_email,
+               p.email as sender_email,
+               to_char(m.sent_date, 'Dy, DD Mon YYYY HH24:MI:SS') as sent_date,
+               m.rfc822_id,
+               m.title,
+               m.mime_type,
+               m.content,
+               m2.rfc822_id as in_reply_to
+            from acs_messages_outgoing o,
+                 acs_messages_all m left outer join acs_messages_all m2 on (m2.message_id = m.reply_to),
+                 parties p
+            where o.message_id = m.message_id
+                and p.party_id = m.sender
+                and wait_until <= current_timestamp
+      </querytext>
+</fullquery>
  
 </queryset>