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.98 -r1.99
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	29 Dec 2017 11:54:28 -0000	1.98
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.tcl	17 Feb 2018 17:08:31 -0000	1.99
@@ -136,6 +136,11 @@
 
         set smtppassword [parameter::get -parameter "SMTPPassword" \
                               -package_id $mail_package_id]
+
+        # Consider adding code here to 
+        # set orignator to acs-mail-lite parameter FixedSenderEmail
+        # if FixedSenderEmail is not empty,
+        # so as to be consistent for all cases calling this proc.
         
         set cmd [list smtp::sendmessage $multi_token -originator $originator]
         foreach header $headers {
@@ -417,9 +422,31 @@
             set reply_to $from_addr
         }
 
+        # Get any associated data indicating need to sign message-id
+
+        # associate a user_id
+        set rcpt_id 0
+        if { [llength $to_addr] eq 1 } {
+            set rcpt_id [party::get_by_email -email $to_addr]
+        }
+        set rcpt_id [ad_decode $rcpt_id "" 0 $rcpt_id]
+
+
         # Set the message_id
-        set message_id [mime::uniqueID]
+        # message-id gets signed if parameter defaults not passed
+        set message_id [acs_mail_lite::unique_id_create \
+                            -object_id $object_id \
+                            -package_id $package_id \
+                            -party_id $rcpt_id]
 
+
+        # Build the originator address to be used as envelope sender
+        # and originator etc. 
+        set orginator [bounce_address -user_id $rcpt_id \
+                            -package_id $package_id \
+                            -message_id $message_id]
+
+
         # Set the date
         set message_date [acs_mail_lite::utils::build_date]
 
@@ -567,17 +594,8 @@
             lappend headers_list [list DCC [join $bcc_addr ","]]
         }
 
-        # Build the originator address to be used as envelope sender
-        set rcpt_id 0
-        if { [llength $to_addr] eq 1 } {
-            set rcpt_id [party::get_by_email -email $to_addr]
-        }
-        set rcpt_id [ad_decode $rcpt_id "" 0 $rcpt_id]
+        set originator $message_id
 
-        set originator [bounce_address -user_id $rcpt_id \
-                            -package_id $package_id \
-                            -message_id $message_id]
-
         set errorMsg ""
         set status ok
         
@@ -634,7 +652,7 @@
 	# could need to look at files for their own purposes.
         if {[string is true $delete_filesystem_files_p]} {
 	    foreach f $filesystem_files {
-		file delete -- $f
+		file delete $f
 	    }
 	}
         if {$status ne "ok"} {
@@ -672,7 +690,7 @@
         {bcc {}}
     } {
 
-        Replacement for ns_sendmail for backward compatibility.
+        Replacement for ns_sendmail for backward compability.
 
     } {