Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	21 Jan 2004 17:58:58 -0000	1.8
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	21 Jan 2004 19:07:54 -0000	1.9
@@ -497,7 +497,7 @@
 		ns_log Notice "acs-mail-lite: Email bouncing from $rcpt, mail not sent and deleted from queue"
 	    }
 	    # log mail sending time
-	    if {![empty_string_p $user_id]} { log_mail_sending -user_id $rcpt_id }
+	    if {![empty_string_p $rcpt_id]} { log_mail_sending -user_id $rcpt_id }
 	}
     }
     
@@ -577,7 +577,7 @@
 		ns_log Notice "acs-mail-lite: Email bouncing from $rcpt, mail not sent and deleted from queue"
 	    }
 	    # log mail sending time
-	    	    if {![empty_string_p $user_id]} { log_mail_sending -user_id $rcpt_id }
+	    if {![empty_string_p $rcpt_id]} { log_mail_sending -user_id $rcpt_id }
 	}
     }
 
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.1 -r1.2
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.xql	14 Jan 2004 17:34:52 -0000	1.1
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.xql	21 Jan 2004 19:07:54 -0000	1.2
@@ -97,7 +97,7 @@
    <fullquery name="acs_mail_lite::get_address_array.get_user_name_and_id">
      <querytext>
 
-       select user_id, first_names as user_first_names, last_name as user_last_name
+       select user_id, first_names || ' ' || last_name as user_name
        from cc_users
        where email = :email