Index: openacs-4/packages/dotlrn/tcl/spam-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/spam-procs.tcl,v
diff -u -N -r1.13.2.2 -r1.13.2.3
--- openacs-4/packages/dotlrn/tcl/spam-procs.tcl	23 Feb 2021 16:15:47 -0000	1.13.2.2
+++ openacs-4/packages/dotlrn/tcl/spam-procs.tcl	24 Feb 2021 11:02:52 -0000	1.13.2.3
@@ -71,22 +71,21 @@
         @param message_values a list of tuples of key/value pairs to
                               interpolate into the email
     } {
+        set subject [string map $message_values $subject]
+        set message [string map $message_values $message]
 
-        set subject [interpolate -values $message_values -text $subject]
-        set message [interpolate -values $message_values -text $message]
-
         # loop through all the recipients and send them the spam
         set errors ""
         db_foreach select_recipient_info {} {
             # replace some values in the subject and the message
             set values [list]
-            lappend values [list \{email\} $email]
-            lappend values [list \{first_names\} $first_names]
-            lappend values [list \{last_name\} $last_name]
-            lappend values [list \{from\} $from]
+            lappend values \{email\} "$email"
+            lappend values \{first_names\} "$first_names"
+            lappend values \{last_name\} "$last_name"
+            lappend values \{from\} "$from"
 
-            set subject [interpolate -values $values -text $subject]
-            set message [interpolate -values $values -text $message]
+            set subject [string map $values $subject]
+            set message [string map $values $message]
 
             # send the email
             if {[catch {acs_mail_lite::send -send_immediately -to_addr $email -from_addr $from -subject $subject -body $message} errmsg]} {