Index: openacs-4/packages/forums/www/message-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.adp,v
diff -u -r1.42 -r1.42.2.1
--- openacs-4/packages/forums/www/message-view.adp	3 Jul 2015 17:36:38 -0000	1.42
+++ openacs-4/packages/forums/www/message-view.adp	19 Sep 2015 16:55:56 -0000	1.42.2.1
@@ -13,12 +13,18 @@
     <li><a href="@thread_url@" title="#forums.Back_to_thread_label#">#forums.Back_to_thread_label#</a></li>
   </ul>
 
-  <p>@notification_chunk;noquote@</p>
+<if @message_url@ not nil>
+<p>
+<include src="/packages/notifications/lib/notification-widget" type="forums_message_notif"
+	 object_id="@message.message_id;literal@"
+	 pretty_name="@message.subject;literal@"
+	 url="@message_url;literal@" >
+</if>
 
-  <include src="/packages/forums/lib/message/thread-chunk"
-    &message="message"
-    &forum="forum"
-    &permissions="permissions">
+<include src="/packages/forums/lib/message/thread-chunk"
+      &message="message"
+      &forum="forum"
+      &permissions="permissions" >
 
     <if @reply_url@ not nil>
       <if @forum.presentation_type@ eq "flat">
Index: openacs-4/packages/forums/www/message-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.tcl,v
diff -u -r1.52.2.1 -r1.52.2.2
--- openacs-4/packages/forums/www/message-view.tcl	12 Sep 2015 11:06:28 -0000	1.52.2.1
+++ openacs-4/packages/forums/www/message-view.tcl	19 Sep 2015 16:55:56 -0000	1.52.2.2
@@ -72,14 +72,7 @@
 
 # If this is a top-level thread, we allow subscriptions here
 if { $message(parent_id) eq "" } {
-    set notification_chunk [notification::display::request_widget \
-        -type forums_message_notif \
-        -object_id $message(message_id) \
-        -pretty_name $message(subject) \
-        -url [ad_conn url]?message_id=$message(message_id) \
-    ]
-} else {
-    set notification_chunk ""
+    set message_url [export_vars -base [ad_conn url] {message_id $message(message_id)}]
 }
 
 if { [forum::use_ReadingInfo_p] && $message(state) eq "approved" } {