Index: openacs-4/packages/notifications/notifications.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/notifications.info,v
diff -u -r1.55.2.6 -r1.55.2.7
--- openacs-4/packages/notifications/notifications.info	21 May 2016 10:18:18 -0000	1.55.2.6
+++ openacs-4/packages/notifications/notifications.info	25 Nov 2016 17:44:16 -0000	1.55.2.7
@@ -8,7 +8,7 @@
     <singleton-p>t</singleton-p>
     <auto-mount>notifications</auto-mount>
 
-    <version name="5.9.1d1" url="http://openacs.org/repository/download/apm/notifications-5.9.1d1.apm">
+    <version name="5.9.1d2" url="http://openacs.org/repository/download/apm/notifications-5.9.1d2.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Email notifications management</summary>
         <release-date>2015-10-04</release-date>
@@ -17,9 +17,9 @@
         <maturity>3</maturity>
         <package_instance_name>#notifications.Notifications#</package_instance_name>
 
-        <provides url="notifications" version="5.9.1d1"/>
+        <provides url="notifications" version="5.9.1d2"/>
         <requires url="acs-kernel" version="5.9.0"/>
-	<requires url="acs-tcl" version="5.9.1d7"/>
+	<requires url="acs-tcl" version="5.9.1d13"/>
         <requires url="acs-mail-lite" version="5.9.0"/>
 
         <callbacks>
Index: openacs-4/packages/notifications/tcl/notification-email-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-email-procs.tcl,v
diff -u -r1.38.2.4 -r1.38.2.5
--- openacs-4/packages/notifications/tcl/notification-email-procs.tcl	25 Nov 2016 11:51:06 -0000	1.38.2.4
+++ openacs-4/packages/notifications/tcl/notification-email-procs.tcl	25 Nov 2016 17:44:16 -0000	1.38.2.5
@@ -135,28 +135,9 @@
            set content $content_html
        }
 
-       # DAVEB convert relative URLs to fully qualified URLs
-       set host "[string trimright [ad_url] "/"]/"
-       #set re {(href|src)=['\"][^(http|https|mailto:)]/?([^'\"]+?)['\"]}
-       #set subspec "\\1='${host}\\2'"
-       #set content [regsub -all $re $content $subspec]
+       # convert relative URLs to fully qualified URLs
+       set content [ad_html_qualify_links $content]
 
-       # Protect all full qualified URLs with special characters (one
-       # rule for single quotes, one for double quotes).
-       regsub -nocase -all \
-           {(href|src)\s*=\s*'((http|https|ftp|mailto):[^'\"]+)'} $content \
-           "\\1='\u0001\\2\u0002'" content
-       regsub -nocase -all \
-           {(href|src)\s*=\s*[\"]((http|https|ftp|mailto):[^'\"]+)[\"]} $content \
-           "\\1=\"\u0001\\2\u0002\"" content
-       
-       set content [regsub -all {(href|src)=['\"]([^\u0001:'\"]+?)['\"]} $content "\\1='${host}\\2'"]
-       #
-       # remove protection characters
-       #
-       regsub -nocase -all {((href|src)\s*=\s*['\"]?)\u0001([^\u0002]*)\u0002} $content {\1\3} content
-       
-
        # Use this to build up extra mail headers        
        set extra_headers [list]