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 -N -r1.78 -r1.78.2.1
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	12 Jan 2008 12:55:45 -0000	1.78
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	8 Apr 2008 15:24:55 -0000	1.78.2.1
@@ -149,10 +149,22 @@
         
         set cmd_string "smtp::sendmessage $multi_token"     
         foreach header $headers {
-            append cmd_string " -header {$header}"
+	    if {[lindex $header 1] ne ""} {
+		append cmd_string " -header {$header}"
+	    }
         }
-        append cmd_string " -servers $smtp -ports $smtpport -username $smtpuser -password $smtppassword"
-        ns_log Debug "send cmd_string: $cmd_string"
+
+        append cmd_string " -servers $smtp -ports $smtpport"
+
+	if {$smtpuser ne ""} {
+	    append cmd_string "-username $smtpuser"
+	}
+
+	if {$smtppassword ne ""} {
+	    append cmd_string "-password $smtppassword"
+	}
+
+        ns_log Notice "send cmd_string: $cmd_string"
         eval $cmd_string
     }
 
Index: openacs-4/packages/acs-mail-lite/tcl/complex-send-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/Attic/complex-send-procs.tcl,v
diff -u -N -r1.24 -r1.24.2.1
--- openacs-4/packages/acs-mail-lite/tcl/complex-send-procs.tcl	11 Jan 2008 11:10:40 -0000	1.24
+++ openacs-4/packages/acs-mail-lite/tcl/complex-send-procs.tcl	8 Apr 2008 15:24:55 -0000	1.24.2.1
@@ -619,7 +619,7 @@
                 foreach party $recipient_list {
                     set message_id [mime::uniqueID]
                     set email [party::email_not_cached -party_id $party]
-                    if {[acs_mail_lite::utils::valid_email_p -email $email]} {
+                    if {[acs_mail_lite::utils::valid_email_p $email]} {
                         set email "\"[party::name -party_id $party]\" <$email>"
                         
                         acs_mail_lite::smtp -multi_token $multi_token \