diff --git a/UI/Templates/SOGoACLEnglishAdditionAdvisory.wox b/UI/Templates/SOGoACLEnglishAdditionAdvisory.wox
index 250cb5189..3328da917 100644
--- a/UI/Templates/SOGoACLEnglishAdditionAdvisory.wox
+++ b/UI/Templates/SOGoACLEnglishAdditionAdvisory.wox
@@ -8,20 +8,20 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    <var:string value="currentUserName"/> has added you
+    <var:string value="currentUserName" const:escapeHTML="NO"/> has added you
 </var:if>
 
 <var:if condition="isBody">
-<var:string value="currentUserName"/> has added you to the access list for his '<var:string value="resourceName"/>' folder.
+<var:string value="currentUserName" const:escapeHTML="NO"/> has added you to the access list for his "<var:string value="resourceName" const:escapeHTML="NO"/>" folder.
 
 You can subscribe directly to that folder by following this link:
-    <var:string value="httpAdvisoryURL"/>subscribe?mail-invitation=YES
+    <var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>subscribe?mail-invitation=YES
 
 Otherwise, you will be able to subscribe later from the SOGo web interface.
 
 You can also access this resource remotely using the following URL:
 
-<var:string value="httpFolderURL"/>
+<var:string value="httpFolderURL" const:escapeHTML="NO"/>
 </var:if>
 
 </container>
diff --git a/UI/Templates/SOGoACLEnglishModificationAdvisory.wox b/UI/Templates/SOGoACLEnglishModificationAdvisory.wox
index 54fa443b8..6244a0686 100644
--- a/UI/Templates/SOGoACLEnglishModificationAdvisory.wox
+++ b/UI/Templates/SOGoACLEnglishModificationAdvisory.wox
@@ -8,20 +8,20 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    <var:string value="currentUserName"/> has modified the access rights
+    <var:string value="currentUserName" const:escapeHTML="NO"/> has modified the access rights
 </var:if>
 
 <var:if condition="isBody">
-<var:string value="currentUserName"/> has modified your access rights for his '<var:string value="resourceName"/>' folder.
+<var:string value="currentUserName" const:escapeHTML="NO"/> has modified your access rights for his "<var:string value="resourceName" const:escapeHTML="NO"/>" folder.
 
 You can subscribe directly to that folder by following this link:
-    <var:string value="httpAdvisoryURL"/>subscribe?mail-invitation=YES
+    <var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>subscribe?mail-invitation=YES
 
 Otherwise, you will be able to subscribe later from the SOGo web interface.
 
 You can also access this resource remotely using the following URL:
 
-<var:string value="httpFolderURL"/>
+<var:string value="httpFolderURL" const:escapeHTML="NO"/>
 </var:if>
 
 </container>
diff --git a/UI/Templates/SOGoACLEnglishRemovalAdvisory.wox b/UI/Templates/SOGoACLEnglishRemovalAdvisory.wox
index 6a4009357..a50a1a5e6 100644
--- a/UI/Templates/SOGoACLEnglishRemovalAdvisory.wox
+++ b/UI/Templates/SOGoACLEnglishRemovalAdvisory.wox
@@ -8,20 +8,20 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    <var:string value="currentUserName"/> has removed you
+    <var:string value="currentUserName" const:escapeHTML="NO"/> has removed you
 </var:if>
 
 <var:if condition="isBody">
-<var:string value="currentUserName"/> has removed you from the access list for his '<var:string value="resourceName"/>' folder.
+<var:string value="currentUserName" const:escapeHTML="NO"/> has removed you from the access list for his "'<var:string value="resourceName" const:escapeHTML="NO"/>'" folder.
 
 You can unsubscribe directly to that folder by following this link:
-    <var:string value="httpAdvisoryURL"/>unsubscribe?mail-invitation=YES
+    <var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
 
 Otherwise, you will be able to unsubscribe later from the SOGo web interface.
 
 You can also no longer access this resource using the following URL:
 
-<var:string value="httpFolderURL"/>
+<var:string value="httpFolderURL" const:escapeHTML="NO"/>
 </var:if>
 
 </container>
diff --git a/UI/Templates/SOGoACLFrenchAdditionAdvisory.wox b/UI/Templates/SOGoACLFrenchAdditionAdvisory.wox
index 3166ecc23..cae457556 100644
--- a/UI/Templates/SOGoACLFrenchAdditionAdvisory.wox
+++ b/UI/Templates/SOGoACLFrenchAdditionAdvisory.wox
@@ -8,20 +8,20 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    <var:string value="currentUserName"/> a modifié les droits
+    <var:string value="currentUserName" const:escapeHTML="NO"/> a modifié les droits
 </var:if>
 
 <var:if condition="isBody">
-<var:string value="currentUserName"/> vous a ajouté à sa liste de permission pour son dossier '<var:string value="resourceName"/>'.
+<var:string value="currentUserName" const:escapeHTML="NO"/> vous a ajouté à sa liste de permissions pour son dossier "<var:string value="resourceName" const:escapeHTML="NO"/>".
 
 Vous pouvez vous inscrire directement à ce dossier en cliquant sur le lien suivant:
-    <var:string value="httpAdvisoryURL"/>unsubscribe?mail-invitation=YES
+    <var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
 
 Autrement, il vous sera toujours possible de vous inscrire plus tard via l'interface web de SOGo.
 
-De plus, vous pouvez aussi accéder au dossier en utilisant le lien suivant:
+De plus, vous pouvez accéder au dossier en utilisant le lien suivant:
 
-<var:string value="httpFolderURL"/>
+<var:string value="httpFolderURL" const:escapeHTML="NO"/>
 </var:if>
 
 </container>
diff --git a/UI/Templates/SOGoACLFrenchModificationAdvisory.wox b/UI/Templates/SOGoACLFrenchModificationAdvisory.wox
index 3a5c5e042..041406909 100644
--- a/UI/Templates/SOGoACLFrenchModificationAdvisory.wox
+++ b/UI/Templates/SOGoACLFrenchModificationAdvisory.wox
@@ -8,20 +8,20 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    <var:string value="currentUserName"/> vous a ajouté
+    <var:string value="currentUserName" const:escapeHTML="NO"/> vous a ajouté
 </var:if>
 
 <var:if condition="isBody">
-<var:string value="currentUserName"/> a modifité vos droits d'accès pour son dossier '<var:string value="resourceName"/>'.
+<var:string value="currentUserName"/> a modifié vos droits d'accès pour son dossier "<var:string value="resourceName" const:escapeHTML="NO"/>".
 
 Vous pouvez vous inscrire directement à ce dossier en cliquant sur le lien suivant:
-    <var:string value="httpAdvisoryURL"/>unsubscribe?mail-invitation=YES
+    <var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
 
 Autrement, il vous sera toujours possible de vous inscrire plus tard via l'interface web de SOGo.
 
-De plus, vous pouvez aussi accéder au dossier en utilisant le lien suivant:
+De plus, vous pouvez accéder au dossier en utilisant le lien suivant:
 
-<var:string value="httpFolderURL"/>
+<var:string value="httpFolderURL" const:escapeHTML="NO"/>
 </var:if>
 
 </container>
diff --git a/UI/Templates/SOGoACLFrenchRemovalAdvisory.wox b/UI/Templates/SOGoACLFrenchRemovalAdvisory.wox
index 497a54eaf..d0c2af2de 100644
--- a/UI/Templates/SOGoACLFrenchRemovalAdvisory.wox
+++ b/UI/Templates/SOGoACLFrenchRemovalAdvisory.wox
@@ -12,7 +12,7 @@
 </var:if>
 
 <var:if condition="isBody">
-<var:string value="currentUserName"/> vous a enlevé de sa liste de permission pour son dossier '<var:string value="resourceName"/>'.
+<var:string value="currentUserName"/> vous a enlevé de sa liste de permission pour son dossier "<var:string value="resourceName"/>".
 
 Vous pouvez vous désinscrire directement en cliquant sur le lien suivant:
     <var:string value="httpAdvisoryURL"/>unsubscribe?mail-invitation=YES
diff --git a/UI/Templates/SOGoACLGermanAdditionAdvisory.wox b/UI/Templates/SOGoACLGermanAdditionAdvisory.wox
index d53f17b87..4d7b99ab2 100644
--- a/UI/Templates/SOGoACLGermanAdditionAdvisory.wox
+++ b/UI/Templates/SOGoACLGermanAdditionAdvisory.wox
@@ -8,14 +8,14 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    Zugangserlaubniss von <var:string value="currentUserName"/> erstellt
+    Zugangserlaubniss von <var:string value="currentUserName" const:escapeHTML="NO"/> erstellt
 </var:if>
 
 <var:if condition="isBody">
-<var:string value="currentUserName"/> hat Ihnen den Zugang zu seinem Ordner '<var:string value="resourceName"/>' erlaubt.
+<var:string value="currentUserName" const:escapeHTML="NO"/> hat Ihnen den Zugang zu seinem Ordner "<var:string value="resourceName" const:escapeHTML="NO"/>" erlaubt.
 
 Folgende URL erlaubt Ihnen, sich sofort an diesem Ordner zu abonnieren:
-    <var:string value="httpAdvisoryURL"/>unsubscribe?mail-invitation=YES
+    <var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
 
 Sie können sich auch später immer noch durch die SOGo Webseiten abonnieren.
 </var:if>
diff --git a/UI/Templates/SOGoACLGermanModificationAdvisory.wox b/UI/Templates/SOGoACLGermanModificationAdvisory.wox
index 5fd02794a..856d816a4 100644
--- a/UI/Templates/SOGoACLGermanModificationAdvisory.wox
+++ b/UI/Templates/SOGoACLGermanModificationAdvisory.wox
@@ -8,14 +8,14 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    Zugangserlaubniss von <var:string value="currentUserName"/> erstellt
+    Zugangserlaubniss von <var:string value="currentUserName" const:escapeHTML="NO"/> erstellt
 </var:if>
 
 <var:if condition="isBody">
-<var:string value="currentUserName"/> PLEASE TRANSLATE '<var:string value="resourceName"/>' XXXXXXXXXX.
+<var:string value="currentUserName" const:escapeHTML="NO"/> PLEASE TRANSLATE "<var:string value="resourceName"/>" XXXXXXXXXX.
 
 Folgende URL erlaubt Ihnen, sich sofort an diesem Ordner zu abonnieren:
-    <var:string value="httpAdvisoryURL"/>unsubscribe?mail-invitation=YES
+    <var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
 
 Sie können sich auch später immer noch durch die SOGo Webseiten abonnieren.
 </var:if>
diff --git a/UI/Templates/SOGoACLGermanRemovalAdvisory.wox b/UI/Templates/SOGoACLGermanRemovalAdvisory.wox
index 9e02af19b..5442bd9f9 100644
--- a/UI/Templates/SOGoACLGermanRemovalAdvisory.wox
+++ b/UI/Templates/SOGoACLGermanRemovalAdvisory.wox
@@ -8,14 +8,14 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    Zugangserlaubniss von <var:string value="currentUserName"/> gelöscht
+    Zugangserlaubniss von <var:string value="currentUserName" const:escapeHTML="NO"/> gelöscht
 </var:if>
 
 <var:if condition="isBody">
-<var:string value="currentUserName"/> erlaubt Ihnen nicht mehr den Zugang zu seinem Order '<var:string value="resourceName"/>'.
+<var:string value="currentUserName" const:escapeHTML="NO"/> erlaubt Ihnen nicht mehr den Zugang zu seinem Order "<var:string value="resourceName"/>".
 
 Sie können sich sofort an folgender URL von diesem Order des-abonnieren:
-    <var:string value="httpAdvisoryURL"/>unsubscribe?mail-invitation=YES
+    <var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
 
 Sich können sich auch später immer noch durch die SOGo Webseiten des-abonnieren.</var:if>
 
diff --git a/UI/Templates/SOGoFolderEnglishAdditionAdvisory.wox b/UI/Templates/SOGoFolderEnglishAdditionAdvisory.wox
index f02d5b07e..55a9d2f91 100644
--- a/UI/Templates/SOGoFolderEnglishAdditionAdvisory.wox
+++ b/UI/Templates/SOGoFolderEnglishAdditionAdvisory.wox
@@ -8,15 +8,15 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    <var:string value="displayName"/> has been created
+    <var:string value="displayName" const:escapeHTML="NO"/> has been created
 </var:if>
 
 <var:if condition="isBody">
-The <var:string value="displayName"/> folder has been created. 
+The "<var:string value="displayName" const:escapeHTML="NO"/>" folder has been created. 
 
 You can access this resource remotely by using the following URL:  
 
-<var:string value="httpFolderURL"/>
+<var:string value="httpFolderURL" const:escapeHTML="NO"/>
 </var:if>
 
 </container>
diff --git a/UI/Templates/SOGoFolderEnglishRemovalAdvisory.wox b/UI/Templates/SOGoFolderEnglishRemovalAdvisory.wox
index 467c92635..ee56276ce 100644
--- a/UI/Templates/SOGoFolderEnglishRemovalAdvisory.wox
+++ b/UI/Templates/SOGoFolderEnglishRemovalAdvisory.wox
@@ -8,15 +8,15 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    <var:string value="displayName"/> has been deleted
+    "<var:string value="displayName" const:escapeHTML="NO"/>" has been deleted
 </var:if>
 
 <var:if condition="isBody">
-The <var:string value="displayName"/> folder has been deleted. 
+The "<var:string value="displayName" const:escapeHTML="NO"/>" folder has been deleted. 
 
-The following URL is now no longer active:  
+The following URL is now no longer active:
 
-<var:string value="httpFolderURL"/>
+<var:string value="httpFolderURL" const:escapeHTML="NO"/>
 </var:if>
 
 </container>
diff --git a/UI/Templates/SOGoFolderFrenchAdditionAdvisory.wox b/UI/Templates/SOGoFolderFrenchAdditionAdvisory.wox
index a174f264c..d5f223fa2 100644
--- a/UI/Templates/SOGoFolderFrenchAdditionAdvisory.wox
+++ b/UI/Templates/SOGoFolderFrenchAdditionAdvisory.wox
@@ -8,14 +8,14 @@
   xmlns:label="OGo:label">
 
   <var:if condition="isSubject">
-    <var:string value="displayName"/> a été créé
+    "<var:string value="displayName" const:escapeHTML="NO"/>" a été créé
   </var:if>
 
   <var:if condition="isBody">
-Le dossier <var:string value="displayName"/> a été créé.
+Le dossier "<var:string value="displayName" const:escapeHTML="NO"/>" a été créé.
 
 Vous pouvez accéder à distance à ce dossier avec le lien suivant:
 
-    <var:string value="httpFolderURL"/>
+    <var:string value="httpFolderURL" const:escapeHTML="NO"/>
   </var:if>
 </container>
diff --git a/UI/Templates/SOGoFolderFrenchRemovalAdvisory.wox b/UI/Templates/SOGoFolderFrenchRemovalAdvisory.wox
index 4789a02a5..b42b2c463 100644
--- a/UI/Templates/SOGoFolderFrenchRemovalAdvisory.wox
+++ b/UI/Templates/SOGoFolderFrenchRemovalAdvisory.wox
@@ -8,15 +8,15 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    <var:string value="displayName"/> a été supprimé
+    "<var:string value="displayName" const:escapeHTML="NO"/>" a été supprimé
 </var:if>
 
 <var:if condition="isBody">
-Le dossier <var:string value="displayName"/> a été supprimé.
+Le dossier "<var:string value="displayName" const:escapeHTML="NO"/>" a été supprimé.
 
 Le lien suivant n'est plus actif:
 
-<var:string value="httpFolderURL"/>
+<var:string value="httpFolderURL" const:escapeHTML="NO"/>
 </var:if>
 
 </container>
diff --git a/UI/Templates/SOGoFolderGermanAdditionAdvisory.wox b/UI/Templates/SOGoFolderGermanAdditionAdvisory.wox
index f02d5b07e..d7c8ecc18 100644
--- a/UI/Templates/SOGoFolderGermanAdditionAdvisory.wox
+++ b/UI/Templates/SOGoFolderGermanAdditionAdvisory.wox
@@ -8,15 +8,15 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    <var:string value="displayName"/> has been created
+    "<var:string value="displayName" const:escapeHTML="NO"/>" has been created
 </var:if>
 
 <var:if condition="isBody">
-The <var:string value="displayName"/> folder has been created. 
+The "<var:string value="displayName" const:escapeHTML="NO"/>" folder has been created. 
 
 You can access this resource remotely by using the following URL:  
 
-<var:string value="httpFolderURL"/>
+<var:string value="httpFolderURL" const:escapeHTML="NO"/>
 </var:if>
 
 </container>
diff --git a/UI/Templates/SOGoFolderGermanRemovalAdvisory.wox b/UI/Templates/SOGoFolderGermanRemovalAdvisory.wox
index 467c92635..1746b54e9 100644
--- a/UI/Templates/SOGoFolderGermanRemovalAdvisory.wox
+++ b/UI/Templates/SOGoFolderGermanRemovalAdvisory.wox
@@ -8,15 +8,15 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    <var:string value="displayName"/> has been deleted
+    "<var:string value="displayName" const:escapeHTML="NO"/>" has been deleted
 </var:if>
 
 <var:if condition="isBody">
-The <var:string value="displayName"/> folder has been deleted. 
+The "<var:string value="displayName" const:escapeHTML="NO"/>" folder has been deleted. 
 
 The following URL is now no longer active:  
 
-<var:string value="httpFolderURL"/>
+<var:string value="httpFolderURL" const:escapeHTML="NO"/>
 </var:if>
 
 </container>