Index: openacs-4/packages/news/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/index.adp,v
diff -u -r1.19 -r1.19.2.1
--- openacs-4/packages/news/www/index.adp	3 Jul 2015 11:04:08 -0000	1.19
+++ openacs-4/packages/news/www/index.adp	20 Sep 2015 16:09:56 -0000	1.19.2.1
@@ -2,16 +2,18 @@
   <property name="context">@context;literal@</property>
   <property name="doc(title)">@title;literal@</property>
 
-    <listtemplate name="news"></listtemplate>
+<listtemplate name="news"></listtemplate>
 
-  <if @notification_chunk@ not nil>
-    <p>@notification_chunk;noquote@</p>
-  </if>
-  <if @rss_exists@ true>
-    <p>
-      <a href="@rss_url@" title="#rss-support.Syndication_Feed#">
-        <img src="/resources/rss-support/xml.gif" alt="Subscribe via RSS">
-        #rss-support.Syndication_Feed#
-      </a>
-    </p>
-  </if>
+<p><include src="/packages/notifications/lib/notification-widget" type="one_news_item_notif"
+	 object_id="@package_id;literal@"
+	 pretty_name="News"
+	 url="@news_url;literal@" >
+
+<if @rss_exists@ true>
+<p>
+<a href="@rss_url@" title="#rss-support.Syndication_Feed#">
+<img src="/resources/rss-support/xml.gif" alt="Subscribe via RSS">
+#rss-support.Syndication_Feed#
+</a>
+</p>
+</if>
Index: openacs-4/packages/news/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/index.tcl,v
diff -u -r1.20.2.1 -r1.20.2.2
--- openacs-4/packages/news/www/index.tcl	12 Sep 2015 11:06:42 -0000	1.20.2.1
+++ openacs-4/packages/news/www/index.tcl	20 Sep 2015 16:09:56 -0000	1.20.2.2
@@ -105,13 +105,8 @@
                     -summary_context_id $package_id \
                     -impl_name news]
 set rss_url "[news_util_get_url $package_id]rss/rss.xml"
+set news_url [ad_return_url]
 
-set notification_chunk [notification::display::request_widget \
-                        -type one_news_item_notif \
-                        -object_id $package_id \
-                        -pretty_name "News" \
-                        -url [ad_return_url] \
-                        ]
 ad_return_template
 
 # Local variables:
Index: openacs-4/packages/news-portlet/www/news-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.adp,v
diff -u -r1.18 -r1.18.2.1
--- openacs-4/packages/news-portlet/www/news-portlet.adp	14 Jul 2015 22:36:41 -0000	1.18
+++ openacs-4/packages/news-portlet/www/news-portlet.adp	20 Sep 2015 16:09:57 -0000	1.18.2.1
@@ -25,7 +25,12 @@
           <a href="@news_url@news/item-create" title="#news-portlet.Add_a_News_Item#" class="button">#news-portlet.Add_a_News_Item#</a>
         </div>
         <div>
-          @notification_chunk;noquote@
+<if @news_url@ not nil>
+<include src="/packages/notifications/lib/notification-widget" type="one_news_item_notif"
+	 object_id="@package_id;literal@"
+	 pretty_name="News"
+	 url="@news_url;literal@" >
+</if>	 
           <if @rss_exists@ eq 1>
             <br>
               <a href="@rss_url@"><img src="/resources/xml.gif" alt="Subscribe via RSS" width="26" height="10" style="border:0; padding-right:3px">#rss-support.Syndication_Feed#</a>
Index: openacs-4/packages/news-portlet/www/news-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.tcl,v
diff -u -r1.22.2.1 -r1.22.2.2
--- openacs-4/packages/news-portlet/www/news-portlet.tcl	12 Sep 2015 11:06:45 -0000	1.22.2.1
+++ openacs-4/packages/news-portlet/www/news-portlet.tcl	20 Sep 2015 16:09:57 -0000	1.22.2.2
@@ -49,19 +49,17 @@
     set package_id $config(package_id)
     set rss_exists [rss_support::subscription_exists -summary_context_id $package_id -impl_name news]
     set rss_url "[news_util_get_url $package_id]rss/rss.xml"
+    set news_url [ad_return_url]
 
-    # add news email notification
-    set notification_chunk [notification::display::request_widget -type one_news_item_notif -object_id $package_id -pretty_name "News" -url [ad_return_url] ]
-}
-
-if { $inside_comm_p && $display_subgroup_items_p } {
-
-    db_foreach select_subgroup_package_ids {} {
-        set one_instance_p 0
-        lappend list_of_package_ids $package_id
+    if { $display_subgroup_items_p } {
+        db_foreach select_subgroup_package_ids {} {
+            set one_instance_p 0
+            lappend list_of_package_ids $package_id
+        }
     }
 }
 
+
 if { $display_item_content_p } {
     #Only pull out the full content if we have to.
     set content_column " , content as publish_body, mime_type as publish_format "