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 -N -r1.4 -r1.5
--- openacs-4/packages/forums/tcl/forums-email-procs.tcl	15 May 2007 20:14:40 -0000	1.4
+++ openacs-4/packages/forums/tcl/forums-email-procs.tcl	27 Jun 2015 21:29:52 -0000	1.5
@@ -31,12 +31,15 @@
     # 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]
+    append new_body [subst {[_ forums.email_alert_body_header]
 [_ forums.Forum_1] $message(forum_name)
-Thread: $message(root_subject)\n\n"
+Thread: $message(root_subject)\n
+}]
     append new_body [ad_html_text_convert -from $message(format) -to text/plain -- $message(content)]
+    set url [export_vars \
+		 -base "[ad_url][ad_conn package_url]message-view" \
+		 -anchor $message(message_id) {{message_id $message(root_message_id)}}]
+    append new_body "\n\n-- \n$url\n"
 
-    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
 }