diff --git a/UI/Templates/MailerUI/UIxMailWindowCloser.wox b/UI/Templates/MailerUI/UIxMailWindowCloser.wox
index 77498df8c..63e643f36 100644
--- a/UI/Templates/MailerUI/UIxMailWindowCloser.wox
+++ b/UI/Templates/MailerUI/UIxMailWindowCloser.wox
@@ -8,17 +8,14 @@
 >
   <head>
     <title><var:string label:value="Closing Window ..."/></title>
-    <meta name="description" content="SOGo Web Interface"/>
-    <meta name="author"      content="SKYRIX Software AG"/>
     <meta name="robots"      content="stop"/>
-    <link href="mailto:info@skyrix.com" rev="made"/>
   </head>
 
   <body>
     <var:if condition="refreshOpener">
       <script language="JavaScript"
         ><var:string value="refreshOpenerScript" 
-                     const:escapeHTML="0" /></script>
+                     const:escapeHTML="NO" /></script>
     </var:if>
 
     <script language="JavaScript">window.close();</script>
diff --git a/UI/Templates/PreferencesUI/UIxFilterEditor.wox b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
index c5f434e61..f6f88ef06 100644
--- a/UI/Templates/PreferencesUI/UIxFilterEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxFilterEditor.wox
@@ -13,7 +13,7 @@
   >
   <script type="text/javascript">
     var filterId = '<var:string value="filterId"/>';
-    var mailTags = <var:string value="labels" const:escapeHTML="0"/>;
+    var mailTags = <var:string value="labels" const:escapeHTML="NO"/>;
   </script>
   <form id="mainForm" var:href="ownPath">
     <div id="filterNameContainer" class="container">
