Index: openacs-4/packages/file-storage/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.adp,v
diff -u -r1.37 -r1.37.2.1
--- openacs-4/packages/file-storage/www/index.adp	14 Jul 2015 22:22:27 -0000	1.37
+++ openacs-4/packages/file-storage/www/index.adp	20 Sep 2015 17:30:51 -0000	1.37.2.1
@@ -17,12 +17,14 @@
 
 	</div>
 </if>
-<include src="folder-chunk" folder_id="@folder_id;literal@"
-    n_past_days="@n_past_days;literal@" allow_bulk_actions="1" return_url="@return_url;literal@" category_id="@category_id;literal@">
+<include src="folder-chunk" &="folder_id" &="n_past_days" allow_bulk_actions="1" &="return_url" &="category_id">
 
+<p>
+<include src="/packages/notifications/lib/notification-widget" type="fs_fs_notif"
+	 object_id="@folder_id;literal@"
+	 pretty_name="@folder_name;literal@"
+	 url="@folder_url;literal@" >
 
-<p>@notification_chunk;noquote@</p>
-
 <if @webdav_url@ not nil>
     <p>#file-storage.Folder_available_via_WebDAV_at#</p>
 </if>
Index: openacs-4/packages/file-storage/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.tcl,v
diff -u -r1.32.2.1 -r1.32.2.2
--- openacs-4/packages/file-storage/www/index.tcl	12 Sep 2015 11:06:20 -0000	1.32.2.1
+++ openacs-4/packages/file-storage/www/index.tcl	20 Sep 2015 17:30:51 -0000	1.32.2.2
@@ -80,12 +80,7 @@
     -value $folder_id
 
 
-set notification_chunk [notification::display::request_widget \
-    -type fs_fs_notif \
-    -object_id $folder_id \
-    -pretty_name $folder_name \
-    -url [ad_conn url]?folder_id=$folder_id \
-]
+set folder_url [export_vars -base [ad_conn url] {folder_id}]
 
 if {[form is_valid n_past_days_form]} {
     form get_values n_past_days_form n_past_days folder_id
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp,v
diff -u -r1.15 -r1.15.2.1
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	14 Jul 2015 22:36:41 -0000	1.15
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	20 Sep 2015 17:30:51 -0000	1.15.2.1
@@ -20,8 +20,14 @@
 
 <if @config.shaded_p@ ne "t">
 
-<include src="@scope_fs_url;literal@" folder_id="@folder_id;literal@" root_folder_id="@root_folder_id;literal@" viewing_user_id="@user_id;literal@" n_past_days="@n_past_days;literal@" fs_url="@url;literal@">
-<p>@notification_chunk;noquote@</p>
+<include src="@scope_fs_url;literal@" &="folder_id" &="root_folder_id" viewing_user_id="@user_id;literal@"
+	 &="n_past_days" fs_url="@url;literal@">
+
+<p><include src="/packages/notifications/lib/notification-widget" type="fs_fs_notif"
+	 object_id="@folder_id;literal@"
+	 pretty_name="@folder_name;literal@"
+	 url="@folder_url;literal@" >
+
 <if @webdav_url@ not nil>
       <p>#file-storage.Folder_available_via_WebDAV_at#</p>
 </if>
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl,v
diff -u -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	12 Sep 2015 11:06:33 -0000	1.10.2.1
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	20 Sep 2015 17:30:52 -0000	1.10.2.2
@@ -66,12 +66,7 @@
 # Enable Notifications
 
 set folder_name [fs_get_folder_name $folder_id]
-set notification_chunk [notification::display::request_widget \
-    -type fs_fs_notif \
-    -object_id $folder_id \
-    -pretty_name $folder_name \
-    -url [ad_conn url]?folder_id=$folder_id \
-    ]
+set folder_url [export_vars -base [ad_conn url] {folder_id}]
 
 if {([info exists file_storage_package_id] && $file_storage_package_id ne "")} {
     set use_webdav_p  [parameter::get -package_id $file_storage_package_id -parameter "UseWebDavP"]
Index: openacs-4/packages/fs-portlet/www/fs-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.adp,v
diff -u -r1.36 -r1.36.2.1
--- openacs-4/packages/fs-portlet/www/fs-portlet.adp	14 Jul 2015 22:36:41 -0000	1.36
+++ openacs-4/packages/fs-portlet/www/fs-portlet.adp	20 Sep 2015 17:30:52 -0000	1.36.2.1
@@ -20,12 +20,15 @@
 
 <if @config.shaded_p@ false>
 <if @use_ajaxfs_p@ eq 1>
-<include src="/packages/ajax-filestorage-ui/lib/ajaxfs-include" package_id="@file_storage_package_id;literal@" folder_id="@folder_id;literal@" layoutdiv="fscontainer">
+<include src="/packages/ajax-filestorage-ui/lib/ajaxfs-include" package_id="@file_storage_package_id;literal@"
+	 &="folder_id" layoutdiv="fscontainer">
 </if>
 
 <div id="fscontainer">
 <if @scoped_p@ eq 1>
-<include src="@scope_fs_url;literal@" folder_id="@folder_id;literal@" root_folder_id="@folder_id;literal@" viewing_user_id="@user_id;literal@" n_past_days="@n_past_days;literal@" allow_bulk_actions="1" fs_url="@url;literal@" page_num="@page_num;literal@">
+<include src="@scope_fs_url;literal@" &="folder_id" root_folder_id="@folder_id;literal@"
+	 viewing_user_id="@user_id;literal@" &="n_past_days" allow_bulk_actions="1"
+	 fs_url="@url;literal@" &="page_num">
 </if>
 
 <else>
@@ -41,8 +44,11 @@
   <listtemplate name="folders"></listtemplate>
 </else>
 
-<p>@notification_chunk;noquote@</p>
-
+<p><include src="/packages/notifications/lib/notification-widget" type="fs_fs_notif"
+	 object_id="@folder_id;literal@"
+	 pretty_name="@folder_name;literal@"
+	 url="@folder_url;literal@" >
+	 
 <if @webdav_url@ not nil>
       <p>#file-storage.Folder_available_via_WebDAV_at#</p>
 </if>
Index: openacs-4/packages/fs-portlet/www/fs-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.tcl,v
diff -u -r1.26.2.1 -r1.26.2.2
--- openacs-4/packages/fs-portlet/www/fs-portlet.tcl	12 Sep 2015 11:06:33 -0000	1.26.2.1
+++ openacs-4/packages/fs-portlet/www/fs-portlet.tcl	20 Sep 2015 17:30:52 -0000	1.26.2.2
@@ -156,12 +156,7 @@
 # Enable Notifications
 
 set folder_name [fs_get_folder_name $folder_id]
-set notification_chunk [notification::display::request_widget \
-    -type fs_fs_notif \
-    -object_id $folder_id \
-    -pretty_name $folder_name \
-    -url [ad_conn url]?[ad_conn query]&folder_id=$folder_id \
-    ]
+set folder_url [ad_conn url]?[ad_conn query]&folder_id=$folder_id
 
 if {([info exists file_storage_package_id] && $file_storage_package_id ne "")} {
     set use_webdav_p  [parameter::get -package_id $file_storage_package_id -parameter "UseWebDavP"]