Index: openacs-4/packages/forums/tcl/messages-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-procs.tcl,v
diff -u -r1.31 -r1.31.2.1
--- openacs-4/packages/forums/tcl/messages-procs.tcl	26 Mar 2005 20:29:20 -0000	1.31
+++ openacs-4/packages/forums/tcl/messages-procs.tcl	25 May 2006 02:49:11 -0000	1.31.2.1
@@ -131,7 +131,8 @@
         -response_id $message(message_id) \
         -notif_subject "\[$message(forum_name)\] $message(subject)" \
         -notif_text $text_version \
-        -notif_html $html_version
+        -notif_html $html_version \
+	-notif_user 0
 
     
     # Eventually we need notification for the root message too
@@ -142,7 +143,8 @@
         -response_id $message(message_id) \
         -notif_subject "\[$message(forum_name)\] $message(subject)" \
         -notif_text $text_version \
-        -notif_html $html_version
+        -notif_html $html_version \
+	-notif_user 0
 }
     
 ad_proc -public forum::message::edit {
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.23 -r1.23.2.1
--- openacs-4/packages/notifications/tcl/notification-email-procs.tcl	13 Jan 2005 13:58:33 -0000	1.23
+++ openacs-4/packages/notifications/tcl/notification-email-procs.tcl	25 May 2006 02:49:48 -0000	1.23.2.1
@@ -118,7 +118,7 @@
         
         set reply_to [reply_address -object_id $reply_object_id -type_id $notification_type_id]
 
-        if { ![empty_string_p $from_user_id] && [db_0or1row get_person {}]} {
+       if { ![empty_string_p $from_user_id] && $from_user_id != 0 && [db_0or1row get_person {}]} {
             set from_email "\"$first_names $last_name\" <[cc_email_from_party $from_user_id]>"
 
             # Set the Reply-To and Mail-Followup-To addresses to the