Index: openacs-4/packages/forums/tcl/forums-email-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-email-procs.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/forums/tcl/forums-email-procs.tcl	17 Dec 2003 15:45:30 -0000	1.1
+++ openacs-4/packages/forums/tcl/forums-email-procs.tcl	18 Mar 2004 15:55:04 -0000	1.1.2.1
@@ -20,14 +20,22 @@
     upvar $message_passed message
 
     # Variables for I18N message lookup:
-    set posting_date $message(posting_date)
+    set posting_date $message(posting_date_ansi)
     set user_name $message(user_name)
 
     # Set up the message body
     set new_body "[ad_html_to_text -- $pre_body]"
     append new_body "\n\n===================================\n\n"
-    append new_body "[_ forums.email_alert_body_header]\n\n"
-    append new_body "[ad_html_to_text -- $message(content)]\n"
+    append new_body "[_ forums.email_alert_body_header]
+[_ forums.Forum_1] $message(forum_name)
+Thread: $message(root_subject)\n\n"
+    if {$message(html_p)} {
+        append new_body "[ad_html_to_text -- $message(content)]"
+    } else {
+        append new_body $message(content)
+    }
 
+    append new_body "\n\n-- \n[ad_url][ad_conn package_url]message-view?[export_vars -anchor $message(message_id) [list [list message_id $message(root_message_id)]]]\n"
+
     return $new_body
 }