Index: openacs-4/packages/notifications/catalog/notifications.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/catalog/notifications.de_DE.ISO-8859-1.xml,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/notifications/catalog/notifications.de_DE.ISO-8859-1.xml	10 Dec 2007 09:12:38 -0000	1.17
+++ openacs-4/packages/notifications/catalog/notifications.de_DE.ISO-8859-1.xml	17 Jun 2015 20:34:47 -0000	1.18
@@ -15,12 +15,11 @@
   <msg key="lt_Notification_Delivery">Benachrichtigungsmethode</msg>
   <msg key="lt_Notification_Delivery_1">Benachrichtigungsmethoden</msg>
   <msg key="lt_Notification_Interval">Benachrichtigungsintervall</msg>
-  <msg key="lt_Notification_Interval_1">Benachrichtigunsintervale</msg>
-  <msg key="lt_Notification_Requests">Benachrichtigungen</msg>
   <msg key="lt_Request_Notification_">Benachrichtigungsfunktion f�r %pretty_name% aktivieren</msg>
   <msg key="lt_system_name_-_Batched">[%system_name% - Batched Notification]</msg>
   <msg key="lt_You_have_no_notificat">Sie haben keine Benachrichtigungsfunktion aktiviert.</msg>
-  <msg key="lt_You_have_requested_no">Sie haben f�r &quot;%pretty_name%&quot; die Benachrichtigungsfunktion aktiviert. Sie k�nnen diese &lt;a href=&quot;%sub_url%&quot;&gt;deaktivieren&lt;/a&gt;. </msg>
+  <msg key="lt_You_have_requested_no">Deaktiviere Benachrichtigungsfunktion. </msg>
+  <msg key="lt_You_may_a_hrefsub_url">Aktiviere Benachrichtungungsfunktion</msg>
   <msg key="Manage_Notifications">Benachrichtigungsoptionen verwalten</msg>
   <msg key="Notification">Benachrichtigung</msg>
   <msg key="Notification_Replies">Antworten auf Benachrichtigungen</msg>
Index: openacs-4/packages/notifications/catalog/notifications.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/catalog/notifications.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/notifications/catalog/notifications.es_ES.ISO-8859-1.xml	13 Sep 2009 23:54:42 -0000	1.19
+++ openacs-4/packages/notifications/catalog/notifications.es_ES.ISO-8859-1.xml	17 Jun 2015 20:34:47 -0000	1.20
@@ -20,8 +20,6 @@
   <msg key="lt_Notification_Delivery">Modo de Entrega de Notificaciones</msg>
   <msg key="lt_Notification_Delivery_1">Modos de Entrega de Notificaciones</msg>
   <msg key="lt_Notification_Interval">Intervalo de notificaci�n</msg>
-  <msg key="lt_Notification_Interval_1">Intervalos de Notificaci�n</msg>
-  <msg key="lt_Notification_Requests">Solicitudes de Notificaci�n</msg>
   <msg key="lt_Notifications_Interval">Intervalo de notificaci�n</msg>
   <msg key="lt_Request_Notification_">Pedir notificaci�n para %pretty_name%</msg>
   <msg key="lt_system_name_-_Batched">[%system_name% - Notificaci�n en Batch]</msg>
Index: openacs-4/packages/notifications/tcl/notification-display-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-display-procs.tcl,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/notifications/tcl/notification-display-procs.tcl	27 Oct 2014 16:41:50 -0000	1.19
+++ openacs-4/packages/notifications/tcl/notification-display-procs.tcl	17 Jun 2015 20:34:47 -0000	1.20
@@ -41,22 +41,24 @@
     if {$request_id ne ""} {
         set icon /resources/acs-subsite/email_delete.gif
         set icon_alt [_ acs-subsite.icon_of_envelope]
-        set sub_url [ad_quotehtml [unsubscribe_url -request_id $request_id -url $url]]
+        set sub_url [unsubscribe_url -request_id $request_id -url $url]
         set pretty_name [ad_quotehtml $pretty_name]
         set title [_ notifications.lt_Ubsubscribe_Notification_]
-        set sub_chunk "[_ notifications.lt_You_have_requested_no]"
+        set sub_chunk [_ notifications.lt_You_have_requested_no]
     } else {
         set icon /resources/acs-subsite/email_add.gif
         set icon_alt [_ acs-subsite.icon_of_envelope]
-        set sub_url [ad_quotehtml [subscribe_url -type $type -object_id $object_id -url $url -user_id $user_id -pretty_name $pretty_name]]
+        set sub_url [subscribe_url -type $type -object_id $object_id -url $url -user_id $user_id -pretty_name $pretty_name]
         set pretty_name [ad_quotehtml $pretty_name]
         set title [_ notifications.lt_Request_Notification_]
-        set sub_chunk "[_ notifications.lt_You_may_a_hrefsub_url]"
+        set sub_chunk [_ notifications.lt_You_may_a_hrefsub_url]
     }
-    set notif_chunk "<a href=\"$sub_url\" title=\"$title\"><img src=\"$icon\" alt=\"$icon_alt\" style=\"border:0\"> $sub_chunk</a>"
+    set notif_chunk "<a href=\"[ns_quotehtml $sub_url]\" title=\"[ns_quotehtml $title]\">\
+       <img src=\"$icon\" alt=\"$icon_alt\" style=\"border:0\">$sub_chunk</a>"
     # if they are an admin give them to view all subscribers
     if { [permission::permission_p -object_id $object_id -privilege admin] } {
-        append notif_chunk " \[<a href=\"[export_vars -base /notifications/subscribers -url {object_id}]\">[_ notifications.Subscribers]</a>\]"
+	set href [export_vars -base /notifications/subscribers -url {object_id}]
+        append notif_chunk " \[<a href=\"[ns_quotehtml $href]\">[_ notifications.Subscribers]</a>\]"
     }
 
     if { $sub_url ne "" } {
Index: openacs-4/packages/notifications/www/subscribers.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/subscribers.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/notifications/www/subscribers.tcl	27 Oct 2014 16:41:51 -0000	1.5
+++ openacs-4/packages/notifications/www/subscribers.tcl	17 Jun 2015 20:34:47 -0000	1.6
@@ -25,7 +25,8 @@
 # if objects have multiple types we may need to separate them
 # with different links to their respective objects.
 
-set notice "<a href=\"[export_vars -base object-goto -url {object_id type_id}]\">$name</a> - [_ notifications.Notifications]"
+set url [export_vars -base object-goto -url {object_id type_id}]
+set notice "<a href=\"[ns_quotehtml $url]\">$name</a> - [_ notifications.Notifications]"