Index: openacs-4/packages/acs-mail-lite/tcl/bounce-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/Attic/bounce-procs.tcl,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/acs-mail-lite/tcl/bounce-procs.tcl	27 Mar 2018 12:22:17 -0000	1.18
+++ openacs-4/packages/acs-mail-lite/tcl/bounce-procs.tcl	30 May 2018 12:16:30 -0000	1.19
@@ -29,7 +29,8 @@
         @option email email address to be checked for bouncing
         @return boolean 1 if bouncing 0 if ok.
     } {
-        return [db_string bouncing_p {} -default 0]
+        return [bouncing_user_p \
+                    -user_id [party::get_by_email -email $email]]
     }
 
     #---------------------------------------
@@ -40,7 +41,9 @@
         @option user_id user to be checked for bouncing
         @return boolean 1 if bouncing 0 if ok.
     } {
-        return [db_string bouncing_p {} -default 0]
+        return [acs_user::get_element \
+                    -user_id $user_id \
+                    -element email_bouncing_p]
     }
 
     #---------------------------------------
Index: openacs-4/packages/acs-mail-lite/tcl/bounce-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/Attic/bounce-procs.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-mail-lite/tcl/bounce-procs.xql	20 Nov 2017 13:13:10 -0000	1.3
+++ openacs-4/packages/acs-mail-lite/tcl/bounce-procs.xql	30 May 2018 12:16:30 -0000	1.4
@@ -37,29 +37,6 @@
       </querytext>
     </fullquery>
 
-    <fullquery name="acs_mail_lite::bouncing_email_p.bouncing_p">
-      <querytext>
-
-    	select case when email_bouncing_p = 't' then 1 else 0 end 
-	as send_p 
-      	from users, parties 
-     	where lower(email) = lower(:email)
-          and party_id = user_id
-
-      </querytext>
-    </fullquery>
-
-    <fullquery name="acs_mail_lite::bouncing_user_p.bouncing_p">
-      <querytext>
-
-    	select case when email_bouncing_p = 't' then 1 else 0 end 
-	as send_p 
-      	from users 
-     	where user_id = :user_id
-
-      </querytext>
-    </fullquery>
-
    <fullquery name="acs_mail_lite::check_bounces.delete_log_if_no_recent_bounce">
      <querytext>