Index: openacs-4/packages/notifications/tcl/notification-email-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-email-procs.tcl,v
diff -u -r1.43 -r1.44
--- openacs-4/packages/notifications/tcl/notification-email-procs.tcl	9 May 2018 15:33:33 -0000	1.43
+++ openacs-4/packages/notifications/tcl/notification-email-procs.tcl	28 May 2018 13:06:01 -0000	1.44
@@ -146,7 +146,7 @@
 
        set reply_to [reply_address -object_id $reply_object_id -type_id $notification_type_id]
 
-       if { $from_user_id ne "" && $from_user_id != 0 && [db_0or1row get_person {}]} {
+       if { $from_user_id ni {"" 0} && [person::person_p -party_id $from_user_id]} {
            set from_email [party::email -party_id $from_user_id]
 
            # Set the Mail-Followup-To address to the
Index: openacs-4/packages/notifications/tcl/notification-email-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-email-procs.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/notifications/tcl/notification-email-procs.xql	6 Nov 2003 19:23:02 -0000	1.4
+++ openacs-4/packages/notifications/tcl/notification-email-procs.xql	28 May 2018 13:06:01 -0000	1.5
@@ -1,14 +1,6 @@
 <?xml version="1.0"?>
 <queryset>
 
-  <fullquery name="notification::email::send.get_person">
-    <querytext>
-       select first_names, last_name
-       from persons
-       where person_id = :from_user_id
-    </querytext>
-  </fullquery>
-
     <fullquery name="notification::email::load_qmail_mail_queue.holdinsert">
       <querytext>
         insert into notification_email_hold