diff --git a/UI/Templates/ContactsUI/UIxContactEditor.wox b/UI/Templates/ContactsUI/UIxContactEditor.wox
index c1c1b45e7..af3e3b025 100644
--- a/UI/Templates/ContactsUI/UIxContactEditor.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditor.wox
@@ -348,8 +348,4 @@
           onclick="window.close(); return false;" />
       </div>
     </form>
-
-    <script type="text/javascript">
-      initEditorForm();
-    </script>
   </var:component>
diff --git a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
index b6b95e63e..9b5e19f2b 100644
--- a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
+++ b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox
@@ -10,11 +10,10 @@
   className="UIxPageFrame"
   title="name"
   const:toolbar="none"
-  const:popup="YES">
-  <script type="text/javascript" rsrc:src="dtree.js"><!-- space --></script>
+  const:popup="YES"
+  const:jsFiles="dtree.js">
   <var:component className="UIxContactsFilterPanel" qualifier="qualifier" />
-  <div id="folders">
-  </div>
+  <div id="folders"><!-- space --></div>
   <div id="buttons">
     <input type="submit" id="addButton" class="button" label:value="Add..."/>
   </div>
diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index bfc1976a6..bbc56eb07 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -9,7 +9,8 @@
   xmlns:label="OGo:label"
   className="UIxPageFrame"
   title="panelTitle"
-  const:popup="YES">
+  const:popup="YES"
+  const:jsFiles="UIxMailToSelection.js">
   <div class="menu" id="attachmentsMenu">
     <ul>
       <li><var:string label:value="Open"/></li>
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 29f8de8c0..8f5012c92 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -7,11 +7,9 @@
   xmlns:label="OGo:label"
   className="UIxPageFrame"
   title="title"
-  >
-  <script type="text/javascript" rsrc:src="dtree.js"><!-- space --></script>
-  <script type="text/javascript" rsrc:src="MailerUI+dTree.js"><!-- space --></script>
+  const:jsFiles="dtree.js,MailerUI+dTree.js">
   <script type="text/javascript">
-    var mailAccounts = '<var:string value="mailAccounts" const:escapeHTML="NO"/>'.evalJSON(true);
+    var textMailAccounts = '<var:string value="mailAccounts" const:escapeHTML="NO"/>';
   </script>
   <div class="menu" id="accountIconMenu">
     <ul>
diff --git a/UI/Templates/MailerUI/UIxMailToSelection.wox b/UI/Templates/MailerUI/UIxMailToSelection.wox
index ebde46970..7aa986ce3 100644
--- a/UI/Templates/MailerUI/UIxMailToSelection.wox
+++ b/UI/Templates/MailerUI/UIxMailToSelection.wox
@@ -8,7 +8,6 @@
     <script type="text/javascript">
       var currentIndex = <var:string value="currentIndex" />;
     </script>
-    <script type="text/javascript" rsrc:src="UIxMailToSelection.js"><!-- space --></script>
 
     <div id="addressList"
       ><var:foreach list="addressLists" item="addressList"
diff --git a/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox b/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox
index a2e393f3d..80ecdd083 100644
--- a/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox
@@ -9,8 +9,8 @@
   xmlns:label="OGo:label"
   className="UIxPageFrame"
   const:toolbar="none"
-  const:popup="YES">
-  <script type="text/javascript" rsrc:src="skycalendar.js"><!-- space --></script>
+  const:popup="YES"
+  const:jsFiles="skycalendar.js">
   <div id="attendeesView">
     <div id="freeBusyViewButtons">
       <var:string label:value="Suggest time slot:"/>
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 19ac4c815..8359c472d 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -7,8 +7,7 @@
   xmlns:rsrc="OGo:url"
   xmlns:label="OGo:label"
   className="UIxPageFrame"
-  title="title"
-  >
+  title="title">
   <script type="text/javascript">
     var UTCOffset = <var:string value="userUTCOffset"/>;
   </script>
diff --git a/UI/Templates/SchedulerUI/UIxComponentEditor.wox b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
index afa92bf3c..52caee9cb 100644
--- a/UI/Templates/SchedulerUI/UIxComponentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
@@ -10,9 +10,8 @@
   className="UIxPageFrame"
   const:popup="YES"
   title="name"
-  var:toolbar="toolbar">
-  <script type="text/javascript" rsrc:src="skycalendar.js"><!-- space --></script>
-  <script type="text/javascript" rsrc:src="UIxComponentEditor.js"><!-- space --></script>
+  var:toolbar="toolbar"
+  const:jsFiles="skycalendar.js,UIxComponentEditor.js">
 
   <script type="text/javascript">
     var activeCalendar = '<var:string value="clientObject.container.nameInContainer"/>';
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 8d73985d5..837071a85 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -35,33 +35,7 @@
 
       <body var:class="bodyClasses"
 	><var:if condition="isCompatibleBrowser"
-	  ><script type="text/javascript">
-	    var ApplicationBaseURL = '<var:string value="applicationPath" />';
-	    var ResourcesURL = '/SOGo.woa/WebServerResources';
-	    <var:if condition="shortUserNameForDisplay" const:value="anonymous"
-	      const:negate="YES"
-	      >var UserFolderURL = '<var:string value="userFolderPath" />';
-	      var UserLogin = '<var:string value="shortUserNameForDisplay" />';</var:if>
-	    <var:string value="commonLocalizableStrings" const:escapeHTML="NO"/>
-	    <var:string value="productLocalizableStrings" const:escapeHTML="NO"/>
-	  </script>
-	  <script type="text/javascript" rsrc:src="events.js"><!-- space required --></script>
-	  <script type="text/javascript" rsrc:src="prototype.js"><!-- space required --></script>
-	  <script type="text/javascript" rsrc:src="tablekit.js"><!-- space required --></script>
-	  <script type="text/javascript" rsrc:src="tablekit-trueresize.js"><!-- space required --></script>
-	  <script type="text/javascript" rsrc:src="JavascriptAPIExtensions.js"><!-- space required --></script>
-	  <script type="text/javascript" rsrc:src="HTMLElement.js"><!-- space required --></script>
-	  <script type="text/javascript" rsrc:src="HTMLInputElement.js"><!-- space required --></script>
-	  <script type="text/javascript" rsrc:src="HTMLTableElement.js"><!-- space required --></script>
-	  <script type="text/javascript" rsrc:src="HTMLUListElement.js"><!-- space required --></script>
-	  <script type="text/javascript" rsrc:src="generic.js"><!-- space required --></script>
-	  <script type="text/javascript" rsrc:src="SOGoDragAndDrop.js"><!-- space required --></script>
-	  <script type="text/javascript" rsrc:src="SOGoDragHandles.js"><!-- space required --></script>
-
-	  <var:if condition="hasProductSpecificJavaScript"><script type="text/javascript"
-	      var:src="productJavaScriptURL"><!-- space required --></script></var:if>
-	  <var:if condition="hasPageSpecificJavaScript"><script type="text/javascript"
-	      var:src="pageJavaScriptURL"><!-- space required --></script></var:if>
+	  >
 	  <var:if condition="shortUserNameForDisplay" const:value="anonymous"
 	    const:negate="YES"
 	    ><var:if condition="shortUserNameForDisplay" const:value="wrongusernamepassword"
@@ -91,6 +65,36 @@
 	    </var:if></var:if>
 	  
 	  <div id="pageContent"><var:component-content/></div>
+
+	  <script type="text/javascript">
+	    var ApplicationBaseURL = '<var:string value="applicationPath" />';
+	    var ResourcesURL = '/SOGo.woa/WebServerResources';
+	    <var:if condition="shortUserNameForDisplay" const:value="anonymous"
+	      const:negate="YES"
+	      >var UserFolderURL = '<var:string value="userFolderPath" />';
+	      var UserLogin = '<var:string value="shortUserNameForDisplay" />';</var:if>
+	    <var:string value="commonLocalizableStrings" const:escapeHTML="NO"/>
+	    <var:string value="productLocalizableStrings" const:escapeHTML="NO"/>
+	  </script>
+	  <script type="text/javascript" rsrc:src="events.js"><!-- space --></script>
+	  <script type="text/javascript" rsrc:src="prototype.js"><!-- space --></script>
+	  <script type="text/javascript" rsrc:src="tablekit.js"><!-- space --></script>
+	  <script type="text/javascript" rsrc:src="tablekit-trueresize.js"><!-- space --></script>
+	  <script type="text/javascript" rsrc:src="JavascriptAPIExtensions.js"><!-- space --></script>
+	  <script type="text/javascript" rsrc:src="HTMLElement.js"><!-- space --></script>
+	  <script type="text/javascript" rsrc:src="HTMLInputElement.js"><!-- space --></script>
+	  <script type="text/javascript" rsrc:src="HTMLTableElement.js"><!-- space --></script>
+	  <script type="text/javascript" rsrc:src="HTMLUListElement.js"><!-- space --></script>
+	  <script type="text/javascript" rsrc:src="generic.js"><!-- space --></script>
+	  <script type="text/javascript" rsrc:src="SOGoDragAndDrop.js"><!-- space --></script>
+	  <script type="text/javascript" rsrc:src="SOGoDragHandles.js"><!-- space --></script>
+	  <var:if condition="hasProductSpecificJavaScript"><script type="text/javascript"
+	      var:src="productJavaScriptURL"><!-- space --></script></var:if>
+	  <var:if condition="hasPageSpecificJavaScript"><script type="text/javascript"
+	      var:src="pageJavaScriptURL"><!-- space --></script></var:if>
+	  <var:foreach list="additionalJSFiles" item="item"
+	    ><script type="text/javascript" var:src="item"><!-- space --></script>
+	  </var:foreach>
         </var:if>
         <var:if condition="isCompatibleBrowser" const:negate="YES">
 	  <div id="loginScreen">
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 6f0ced36e..f70c792eb 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -1,6 +1,9 @@
 /* JavaScript for SOGoMail */
 var accounts = {};
 var mailboxTree;
+var mailAccounts;
+if (typeof textMailAccounts != 'undefined')
+  mailAccounts = textMailAccounts.evalJSON(true);
 
 var currentMessages = new Array();
 var maxCachedMessages = 20;
diff --git a/UI/WebServerResources/UIxContactEditor.js b/UI/WebServerResources/UIxContactEditor.js
index 052b8bfa6..23f334a7a 100644
--- a/UI/WebServerResources/UIxContactEditor.js
+++ b/UI/WebServerResources/UIxContactEditor.js
@@ -133,3 +133,5 @@ function initEditorForm() {
   $("sn").onkeyup = onFnNewValue;
   $("givenName").onkeyup = onFnNewValue;
 }
+
+addEvent(window, 'load', initEditorForm);