diff --git a/UI/Templates/SOGoACLEnglishAdditionAdvisory.wox b/UI/Templates/SOGoACLEnglishAdditionAdvisory.wox
index 3328da917..4eab0d69e 100644
--- a/UI/Templates/SOGoACLEnglishAdditionAdvisory.wox
+++ b/UI/Templates/SOGoACLEnglishAdditionAdvisory.wox
@@ -12,7 +12,7 @@
 </var:if>
 
 <var:if condition="isBody">
-<var:string value="currentUserName" const:escapeHTML="NO"/> has added you to the access list for his "<var:string value="resourceName" const:escapeHTML="NO"/>" folder.
+<var:string value="currentUserName" const:escapeHTML="NO"/> has added you to the access list for his <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder.
 
 You can subscribe directly to that folder by following this link:
     <var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>subscribe?mail-invitation=YES
diff --git a/UI/Templates/SOGoACLEnglishModificationAdvisory.wox b/UI/Templates/SOGoACLEnglishModificationAdvisory.wox
index 6244a0686..9216e7a29 100644
--- a/UI/Templates/SOGoACLEnglishModificationAdvisory.wox
+++ b/UI/Templates/SOGoACLEnglishModificationAdvisory.wox
@@ -12,7 +12,7 @@
 </var:if>
 
 <var:if condition="isBody">
-<var:string value="currentUserName" const:escapeHTML="NO"/> has modified your access rights for his "<var:string value="resourceName" const:escapeHTML="NO"/>" folder.
+<var:string value="currentUserName" const:escapeHTML="NO"/> has modified your access rights for his <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder.
 
 You can subscribe directly to that folder by following this link:
     <var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>subscribe?mail-invitation=YES
diff --git a/UI/Templates/SOGoACLEnglishRemovalAdvisory.wox b/UI/Templates/SOGoACLEnglishRemovalAdvisory.wox
index a50a1a5e6..c9add113e 100644
--- a/UI/Templates/SOGoACLEnglishRemovalAdvisory.wox
+++ b/UI/Templates/SOGoACLEnglishRemovalAdvisory.wox
@@ -12,7 +12,7 @@
 </var:if>
 
 <var:if condition="isBody">
-<var:string value="currentUserName" const:escapeHTML="NO"/> has removed you from the access list for his "'<var:string value="resourceName" const:escapeHTML="NO"/>'" folder.
+<var:string value="currentUserName" const:escapeHTML="NO"/> has removed you from the access list for his <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder.
 
 You can unsubscribe directly to that folder by following this link:
     <var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
diff --git a/UI/Templates/SOGoACLFrenchAdditionAdvisory.wox b/UI/Templates/SOGoACLFrenchAdditionAdvisory.wox
index cae457556..1a3f012d4 100644
--- a/UI/Templates/SOGoACLFrenchAdditionAdvisory.wox
+++ b/UI/Templates/SOGoACLFrenchAdditionAdvisory.wox
@@ -12,7 +12,7 @@
 </var:if>
 
 <var:if condition="isBody">
-<var:string value="currentUserName" const:escapeHTML="NO"/> vous a ajouté à sa liste de permissions pour son dossier "<var:string value="resourceName" const:escapeHTML="NO"/>".
+<var:string value="currentUserName" const:escapeHTML="NO"/> vous a ajouté à sa liste de permissions pour son dossier <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/>.
 
 Vous pouvez vous inscrire directement à ce dossier en cliquant sur le lien suivant:
     <var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
diff --git a/UI/Templates/SOGoACLFrenchModificationAdvisory.wox b/UI/Templates/SOGoACLFrenchModificationAdvisory.wox
index 041406909..9e0700ca7 100644
--- a/UI/Templates/SOGoACLFrenchModificationAdvisory.wox
+++ b/UI/Templates/SOGoACLFrenchModificationAdvisory.wox
@@ -12,7 +12,7 @@
 </var:if>
 
 <var:if condition="isBody">
-<var:string value="currentUserName"/> a modifié vos droits d'accès pour son dossier "<var:string value="resourceName" const:escapeHTML="NO"/>".
+<var:string value="currentUserName"/> a modifié vos droits d'accès pour son dossier <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/>.
 
 Vous pouvez vous inscrire directement à ce dossier en cliquant sur le lien suivant:
     <var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
diff --git a/UI/Templates/SOGoACLFrenchRemovalAdvisory.wox b/UI/Templates/SOGoACLFrenchRemovalAdvisory.wox
index d0c2af2de..502578c13 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 const:value='"' const:escapeHTML="NO"/><var:string value="resourceName"/><var:string const:value='"' const:escapeHTML="NO"/>.
 
 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 4d7b99ab2..127776614 100644
--- a/UI/Templates/SOGoACLGermanAdditionAdvisory.wox
+++ b/UI/Templates/SOGoACLGermanAdditionAdvisory.wox
@@ -12,7 +12,7 @@
 </var:if>
 
 <var:if condition="isBody">
-<var:string value="currentUserName" const:escapeHTML="NO"/> hat Ihnen den Zugang zu seinem Ordner "<var:string value="resourceName" const:escapeHTML="NO"/>" erlaubt.
+<var:string value="currentUserName" const:escapeHTML="NO"/> hat Ihnen den Zugang zu seinem Ordner <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> erlaubt.
 
 Folgende URL erlaubt Ihnen, sich sofort an diesem Ordner zu abonnieren:
     <var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
diff --git a/UI/Templates/SOGoACLGermanModificationAdvisory.wox b/UI/Templates/SOGoACLGermanModificationAdvisory.wox
index 856d816a4..a0453754a 100644
--- a/UI/Templates/SOGoACLGermanModificationAdvisory.wox
+++ b/UI/Templates/SOGoACLGermanModificationAdvisory.wox
@@ -12,7 +12,7 @@
 </var:if>
 
 <var:if condition="isBody">
-<var:string value="currentUserName" const:escapeHTML="NO"/> PLEASE TRANSLATE "<var:string value="resourceName"/>" XXXXXXXXXX.
+<var:string value="currentUserName" const:escapeHTML="NO"/> PLEASE TRANSLATE <var:string const:value='"' const:escapeHTML="NO"/><var:string value="resourceName"/><var:string const:value='"' const:escapeHTML="NO"/> XXXXXXXXXX.
 
 Folgende URL erlaubt Ihnen, sich sofort an diesem Ordner zu abonnieren:
     <var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
diff --git a/UI/Templates/SOGoACLGermanRemovalAdvisory.wox b/UI/Templates/SOGoACLGermanRemovalAdvisory.wox
index 5442bd9f9..6bef2c7df 100644
--- a/UI/Templates/SOGoACLGermanRemovalAdvisory.wox
+++ b/UI/Templates/SOGoACLGermanRemovalAdvisory.wox
@@ -12,7 +12,7 @@
 </var:if>
 
 <var:if condition="isBody">
-<var:string value="currentUserName" const:escapeHTML="NO"/> 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 const:value='"' const:escapeHTML="NO"/><var:string value="resourceName"/><var:string const:value='"' const:escapeHTML="NO"/>.
 
 Sie können sich sofort an folgender URL von diesem Order des-abonnieren:
     <var:string value="httpAdvisoryURL" const:escapeHTML="NO"/>unsubscribe?mail-invitation=YES
diff --git a/UI/Templates/SOGoFolderEnglishAdditionAdvisory.wox b/UI/Templates/SOGoFolderEnglishAdditionAdvisory.wox
index 55a9d2f91..44ad674aa 100644
--- a/UI/Templates/SOGoFolderEnglishAdditionAdvisory.wox
+++ b/UI/Templates/SOGoFolderEnglishAdditionAdvisory.wox
@@ -8,11 +8,11 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    <var:string value="displayName" const:escapeHTML="NO"/> has been created
+    <var:string const:value='"' const:escapeHTML="NO"/><var:string value="displayName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> has been created
 </var:if>
 
 <var:if condition="isBody">
-The "<var:string value="displayName" const:escapeHTML="NO"/>" folder has been created. 
+The <var:string const:value='"' const:escapeHTML="NO"/><var:string value="displayName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder has been created. 
 
 You can access this resource remotely by using the following URL:  
 
diff --git a/UI/Templates/SOGoFolderEnglishRemovalAdvisory.wox b/UI/Templates/SOGoFolderEnglishRemovalAdvisory.wox
index ee56276ce..465b868ce 100644
--- a/UI/Templates/SOGoFolderEnglishRemovalAdvisory.wox
+++ b/UI/Templates/SOGoFolderEnglishRemovalAdvisory.wox
@@ -8,11 +8,11 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    "<var:string value="displayName" const:escapeHTML="NO"/>" has been deleted
+    <var:string const:value='"' const:escapeHTML="NO"/><var:string value="displayName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> has been deleted
 </var:if>
 
 <var:if condition="isBody">
-The "<var:string value="displayName" const:escapeHTML="NO"/>" folder has been deleted. 
+The <var:string const:value='"' const:escapeHTML="NO"/><var:string value="displayName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder has been deleted. 
 
 The following URL is now no longer active:
 
diff --git a/UI/Templates/SOGoFolderFrenchAdditionAdvisory.wox b/UI/Templates/SOGoFolderFrenchAdditionAdvisory.wox
index d5f223fa2..52d0a07fb 100644
--- a/UI/Templates/SOGoFolderFrenchAdditionAdvisory.wox
+++ b/UI/Templates/SOGoFolderFrenchAdditionAdvisory.wox
@@ -8,11 +8,11 @@
   xmlns:label="OGo:label">
 
   <var:if condition="isSubject">
-    "<var:string value="displayName" const:escapeHTML="NO"/>" a été créé
+    <var:string const:value='"' const:escapeHTML="NO"/><var:string value="displayName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> a été créé
   </var:if>
 
   <var:if condition="isBody">
-Le dossier "<var:string value="displayName" const:escapeHTML="NO"/>" a été créé.
+Le dossier <var:string const:value='"' const:escapeHTML="NO"/><var:string value="displayName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> a été créé.
 
 Vous pouvez accéder à distance à ce dossier avec le lien suivant:
 
diff --git a/UI/Templates/SOGoFolderFrenchRemovalAdvisory.wox b/UI/Templates/SOGoFolderFrenchRemovalAdvisory.wox
index b42b2c463..0ee42eb3c 100644
--- a/UI/Templates/SOGoFolderFrenchRemovalAdvisory.wox
+++ b/UI/Templates/SOGoFolderFrenchRemovalAdvisory.wox
@@ -8,11 +8,11 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    "<var:string value="displayName" const:escapeHTML="NO"/>" a été supprimé
+    <var:string const:value='"' const:escapeHTML="NO"/><var:string value="displayName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> a été supprimé
 </var:if>
 
 <var:if condition="isBody">
-Le dossier "<var:string value="displayName" const:escapeHTML="NO"/>" a été supprimé.
+Le dossier <var:string const:value='"' const:escapeHTML="NO"/><var:string value="displayName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> a été supprimé.
 
 Le lien suivant n'est plus actif:
 
diff --git a/UI/Templates/SOGoFolderGermanAdditionAdvisory.wox b/UI/Templates/SOGoFolderGermanAdditionAdvisory.wox
index d7c8ecc18..44ad674aa 100644
--- a/UI/Templates/SOGoFolderGermanAdditionAdvisory.wox
+++ b/UI/Templates/SOGoFolderGermanAdditionAdvisory.wox
@@ -8,11 +8,11 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    "<var:string value="displayName" const:escapeHTML="NO"/>" has been created
+    <var:string const:value='"' const:escapeHTML="NO"/><var:string value="displayName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> has been created
 </var:if>
 
 <var:if condition="isBody">
-The "<var:string value="displayName" const:escapeHTML="NO"/>" folder has been created. 
+The <var:string const:value='"' const:escapeHTML="NO"/><var:string value="displayName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder has been created. 
 
 You can access this resource remotely by using the following URL:  
 
diff --git a/UI/Templates/SOGoFolderGermanRemovalAdvisory.wox b/UI/Templates/SOGoFolderGermanRemovalAdvisory.wox
index 1746b54e9..dce02fd63 100644
--- a/UI/Templates/SOGoFolderGermanRemovalAdvisory.wox
+++ b/UI/Templates/SOGoFolderGermanRemovalAdvisory.wox
@@ -8,11 +8,11 @@
   xmlns:label="OGo:label">
 
 <var:if condition="isSubject">
-    "<var:string value="displayName" const:escapeHTML="NO"/>" has been deleted
+    <var:string const:value='"' const:escapeHTML="NO"/><var:string value="displayName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> has been deleted
 </var:if>
 
 <var:if condition="isBody">
-The "<var:string value="displayName" const:escapeHTML="NO"/>" folder has been deleted. 
+The <var:string const:value='"' const:escapeHTML="NO"/><var:string value="displayName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> folder has been deleted. 
 
 The following URL is now no longer active: