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.26 -r1.27
--- openacs-4/packages/notifications/tcl/notification-email-procs.tcl	15 Oct 2006 07:20:30 -0000	1.26
+++ openacs-4/packages/notifications/tcl/notification-email-procs.tcl	26 Dec 2006 22:48:43 -0000	1.27
@@ -59,6 +59,12 @@
         {-object_id:required}
         {-type_id:required}
     } {
+        # DAVEB allow creation user to be the reply address
+        set creation_user [db_string get_creation_user "select creation_user from acs_objects where object_id=:object_id" -default ""]
+        if {![string equal "" $creation_user]} {
+            acs_user::get -user_id $creation_user -array user
+            return "$user(name) <${user(email)}>"
+        }
         if {[empty_string_p $object_id] || [empty_string_p $type_id]} {
             return "\"[address_domain] mailer\" <[reply_address_prefix]@[address_domain]>"
         } else {
@@ -133,14 +139,21 @@
 	   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::complex_send \
            -to_party_ids $to_user_id \
            -from_addr $from_email \
            -mime_type $mime_type \
            -subject $subject \
            -body $content \
            -use_sender \
-           -extraheaders $extra_headers
+           -extraheaders $eh_list_of_lists
     }
 
     ad_proc -public bounce_mail_message {