Index: openacs-4/packages/notifications/tcl/notification-email-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-email-procs.tcl,v
diff -u -r1.32 -r1.33
--- openacs-4/packages/notifications/tcl/notification-email-procs.tcl	7 Jun 2008 20:29:01 -0000	1.32
+++ openacs-4/packages/notifications/tcl/notification-email-procs.tcl	21 Oct 2008 16:43:00 -0000	1.33
@@ -131,31 +131,24 @@
 	   set content $content_html
        }
 
-        # Use this to build up extra mail headers        
-        set extra_headers [ns_set new]
+       # Use this to build up extra mail headers        
+       set extra_headers [list]
 
-        # This should disable most auto-replies.
-        ns_set put $extra_headers Precedence list
+       # This should disable most auto-replies.
+       lappend extra_headers [list "Precedence" "list"]
         
        set reply_to [reply_address -object_id $reply_object_id -type_id $notification_type_id]
 
        if { ![empty_string_p $from_user_id] && $from_user_id != 0 && [db_0or1row get_person {}]} {
-	   set from_email [cc_email_from_party $from_user_id]
+           set from_email [cc_email_from_party $from_user_id]
 	   
-	   # Set the Mail-Followup-To address to the
-	   # address of the notifications handler.
-	   ns_set put $extra_headers Mail-Followup-To $reply_to
+           # Set the Mail-Followup-To address to the
+           # address of the notifications handler.
+           lappend extra_headers [list "Mail-Followup-To" $reply_to]
        } else {
-	   set from_email $reply_to
+           set from_email $reply_to
        }
 
-       # FIXME REWRITE ACS MAIL LITE TO USE EXTRA HEADERS
-       # SANELY!!! DAVEB 2006-12-26
-       set eh_list_of_lists [list]
-       foreach {key value} [util_ns_set_to_list -set $extra_headers] {
-           lappend $eh_list_of_lists [list $key $value]
-       }
-
        acs_mail_lite::send \
            -to_addr $email \
            -from_addr $from_email \
@@ -165,7 +158,7 @@
            -body $content \
            -file_ids $file_ids \
            -use_sender \
-           -extraheaders $eh_list_of_lists
+           -extraheaders $extra_headers
     }
 
     ad_proc -public bounce_mail_message {