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.17 -r1.18
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	16 Nov 2004 01:42:58 -0000	1.17
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	13 Jan 2005 13:55:28 -0000	1.18
@@ -458,10 +458,12 @@
             if { [string equal [bounce_sendmail] "SMTP"] } {
                 ## Terminate body with a solitary period
                 foreach line [split $msg "\n"] { 
-                    if [string match . $line] {
+                    if {[string match . [string trim $line]]} {
                         append data .
                     }
-                    append data "$line\r\n"
+		    #AG: ensure no \r\r\n terminations.
+		    set trimmed_line [string trimright $line \r]
+		    append data "$trimmed_line\r\n"
                 }
                 append data .