diff --git a/ChangeLog b/ChangeLog
index 259442b12..c30185a4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/Common/UIxPageFrame.m (-systemAdditionalJSFiles): new web
+	accessor for the new method below.
+
+	* SoObjects/SOGo/SOGoDomainDefaults.m (-additionalJSFiles): new
+	accessor for the new "SOGoUIAdditionalJSFiles" user default.
+
 2010-09-13  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
         * Updated Ukrainian translation - patch from
diff --git a/SoObjects/SOGo/SOGoDomainDefaults.h b/SoObjects/SOGo/SOGoDomainDefaults.h
index ac9cb73c2..73b7bb13a 100644
--- a/SoObjects/SOGo/SOGoDomainDefaults.h
+++ b/SoObjects/SOGo/SOGoDomainDefaults.h
@@ -71,6 +71,8 @@
 
 - (BOOL) iPhoneForceAllDayTransparency;
 
+- (NSArray *) additionalJSFiles;
+
 @end
 
 #endif /* SOGODOMAINDEFAULTS_H */
diff --git a/SoObjects/SOGo/SOGoDomainDefaults.m b/SoObjects/SOGo/SOGoDomainDefaults.m
index 3338bfdb6..d445348c7 100644
--- a/SoObjects/SOGo/SOGoDomainDefaults.m
+++ b/SoObjects/SOGo/SOGoDomainDefaults.m
@@ -299,4 +299,9 @@
   return language;
 }
 
+- (NSArray *) additionalJSFiles
+{
+  return [self stringArrayForKey: @"SOGoUIAdditionalJSFiles"];
+}
+
 @end
diff --git a/UI/Common/UIxPageFrame.h b/UI/Common/UIxPageFrame.h
index 331db446f..d0ef937b5 100644
--- a/UI/Common/UIxPageFrame.h
+++ b/UI/Common/UIxPageFrame.h
@@ -44,6 +44,7 @@
   NSArray *usKeys;
   NSMutableArray *additionalCSSFiles;
   NSMutableArray *additionalJSFiles;
+  NSMutableArray *systemAdditionalJSFiles;
 }
 
 - (NSString *) commonLocalizableStrings;
diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
index e6476a6b9..fe2985968 100644
--- a/UI/Common/UIxPageFrame.m
+++ b/UI/Common/UIxPageFrame.m
@@ -50,6 +50,7 @@
       usKeys = nil;
       additionalJSFiles = nil;
       additionalCSSFiles = nil;
+      systemAdditionalJSFiles = nil;
     }
 
   return self;
@@ -64,6 +65,7 @@
   [usKeys release];
   [additionalJSFiles release];
   [additionalCSSFiles release];
+  [systemAdditionalJSFiles release];
   [super dealloc];
 }
 
@@ -318,6 +320,31 @@
   return additionalJSFiles;
 }
 
+- (NSArray *) systemAdditionalJSFiles
+{
+  NSArray *prefsJSFiles;
+  SOGoDomainDefaults *dd;
+  int count, max;
+  NSString *currentFile, *filename;
+
+  if (!systemAdditionalJSFiles)
+    {
+      systemAdditionalJSFiles = [NSMutableArray new];
+      dd = [[context activeUser] domainDefaults];
+      prefsJSFiles = [dd additionalJSFiles];
+      max = [prefsJSFiles count];
+      for (count = 0; count < max; count++)
+        {
+          currentFile = [prefsJSFiles objectAtIndex: count];
+          filename = [self urlForResourceFilename:
+                             [currentFile stringByTrimmingSpaces]];
+          [systemAdditionalJSFiles addObject: filename];
+        }
+    }
+
+  return systemAdditionalJSFiles;
+}
+
 - (NSString *) pageCSSURL
 {
   WOComponent *page;
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 9b6ea298c..f8404b3e0 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -168,6 +168,9 @@
 	  <var:foreach list="additionalJSFiles" item="item"
 	    ><script type="text/javascript" var:src="item"><!-- space --></script>
 	  </var:foreach>
+	  <var:foreach list="systemAdditionalJSFiles" item="item"
+	    ><script type="text/javascript" var:src="item"><!-- space --></script>
+	  </var:foreach>
         </var:if>
         <var:if condition="isCompatibleBrowser" const:negate="YES"
 	  ><var:component className="SOGoBrowsersPanel"