Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-oracle.xql,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-oracle.xql	27 Oct 2014 16:39:40 -0000	1.15
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-oracle.xql	20 Nov 2017 13:26:55 -0000	1.16
@@ -50,25 +50,6 @@
         </querytext>
     </fullquery>
 
-   <fullquery name="acs_mail_lite::log_mail_sending.record_mail_sent">
-     <querytext>
-
-       update acs_mail_lite_mail_log
-       set last_mail_date = sysdate
-       where party_id = :user_id
-
-     </querytext>
-   </fullquery>
-
-   <fullquery name="acs_mail_lite::log_mail_sending.insert_log_entry">
-     <querytext>
-
-       insert into acs_mail_lite_mail_log (party_id, last_mail_date)
-       values (:user_id, sysdate)
-
-     </querytext>
-   </fullquery>
-
     <fullquery name="acs_mail_lite::sweeper.get_queued_messages">
         <querytext>
             select
Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-postgresql.xql,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-postgresql.xql	27 Oct 2014 16:39:41 -0000	1.14
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-postgresql.xql	20 Nov 2017 13:26:55 -0000	1.15
@@ -50,26 +50,6 @@
         </querytext>
     </fullquery>
 
-
-   <fullquery name="acs_mail_lite::log_mail_sending.record_mail_sent">
-     <querytext>
-
-       update acs_mail_lite_mail_log
-       set last_mail_date = current_timestamp
-       where party_id = :user_id
-
-     </querytext>
-   </fullquery>
-
-   <fullquery name="acs_mail_lite::log_mail_sending.insert_log_entry">
-     <querytext>
-
-       insert into acs_mail_lite_mail_log (party_id, last_mail_date)
-       values (:user_id, current_timestamp)
-
-     </querytext>
-   </fullquery>
-
     <fullquery name="acs_mail_lite::sweeper.get_queued_messages">
         <querytext>
             select
Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.xql,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.xql	9 Jan 2008 16:51:30 -0000	1.17
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.xql	20 Nov 2017 13:26:55 -0000	1.18
@@ -9,12 +9,11 @@
        where email = :email
          and party_id = person_id
 	order by party_id desc
-	limit 1
+	fetch first 1 row only
 
      </querytext>
    </fullquery>
 
-
     <fullquery name="acs_mail_lite::sweeper.get_queued_message">
         <querytext>
             select message_id as id
@@ -48,4 +47,23 @@
     </querytext>
   </fullquery>
 
+   <fullquery name="acs_mail_lite::log_mail_sending.record_mail_sent">
+     <querytext>
+
+       update acs_mail_lite_mail_log
+       set last_mail_date = current_timestamp
+       where party_id = :user_id
+
+     </querytext>
+   </fullquery>
+
+   <fullquery name="acs_mail_lite::log_mail_sending.insert_log_entry">
+     <querytext>
+
+       insert into acs_mail_lite_mail_log (party_id, last_mail_date)
+       values (:user_id, current_timestamp)
+
+     </querytext>
+   </fullquery>   
+
 </queryset>