diff --git a/ChangeLog b/ChangeLog
index ac479d260..13071ad0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-17  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Common/UIxPageFrame.m ([NSString userLanguage]): returns the
+	user's language. Used to make this information available through
+	JavaScript.
+
 2008-10-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoObject.m ([SOGoObject -davURL])
diff --git a/UI/Common/UIxPageFrame.h b/UI/Common/UIxPageFrame.h
index 8545712c3..080f949bb 100644
--- a/UI/Common/UIxPageFrame.h
+++ b/UI/Common/UIxPageFrame.h
@@ -67,6 +67,8 @@
 
 - (BOOL) isSuperUser;
 
+- (NSString *) userLanguage;
+
 - (BOOL) isCompatibleBrowser;
 
 @end
diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
index bdf1a5f7c..11dd97d16 100644
--- a/UI/Common/UIxPageFrame.m
+++ b/UI/Common/UIxPageFrame.m
@@ -386,6 +386,17 @@
   return [user canAccessModule: @"Mail"];
 }
 
+- (NSString *) userLanguage
+{
+  NSString *language;
+
+  language = [[context activeUser] language];
+  if (!language)
+    language = [SOGoUser language];
+
+  return language;
+}
+
 /* browser/os identification */
 
 - (BOOL) isCompatibleBrowser
diff --git a/UI/Contacts/UIxContactFoldersView.m b/UI/Contacts/UIxContactFoldersView.m
index 27d7526a4..54128163d 100644
--- a/UI/Contacts/UIxContactFoldersView.m
+++ b/UI/Contacts/UIxContactFoldersView.m
@@ -42,6 +42,7 @@
 #import <SoObjects/SOGo/SOGoPermissions.h>
 #import <SoObjects/SOGo/SOGoUser.h>
 #import <SoObjects/SOGo/NSArray+Utilities.h>
+#import <SoObjects/SOGo/NSDictionary+Utilities.h>
 #import <SoObjects/SOGo/NSString+Utilities.h>
 #import <SoObjects/Contacts/SOGoContactFolders.h>
 #import <SoObjects/Contacts/SOGoContactFolder.h>
@@ -192,6 +193,7 @@ withSearchOn: (NSString *) contact
   NSString *searchText, *mail;
   NSDictionary *contact, *data;
   NSArray *folders, *contacts, *descriptors, *sortedContacts;
+  NSMutableArray *sortedFolders;
   NSMutableDictionary *uniqueContacts;
   unsigned int i, j;
   NSSortDescriptor *displayNameDescriptor;
@@ -201,10 +203,20 @@ withSearchOn: (NSString *) contact
     {
       //NSLog(@"Search all contacts: %@", searchText);
       folders = [[self clientObject] subFolders];
+      sortedFolders = [NSMutableArray arrayWithCapacity: [folders count]];
       uniqueContacts = [NSMutableDictionary dictionary];
+      /* We first search in LDAP folders (in case of duplicated entries in GCS folders) */
       for (i = 0; i < [folders count]; i++)
 	{
 	  folder = [folders objectAtIndex: i];
+	  if ([folder isKindOfClass: [SOGoContactLDAPFolder class]])
+	    [sortedFolders insertObject: folder atIndex: 0];
+	  else
+	    [sortedFolders addObject: folder];
+	}
+      for (i = 0; i < [sortedFolders count]; i++)
+	{
+	  folder = [sortedFolders objectAtIndex: i];
 	  //NSLog(@"  Address book: %@ (%@)", [folder displayName], [folder class]);
 	  contacts = [folder lookupContactsWithFilter: searchText
 			     sortBy: @"displayName"
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 7773eaef3..7625fa6b6 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -109,7 +109,8 @@
 	    <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 UserLogin = '<var:string value="shortUserNameForDisplay" />';
+	      var UserLanguage = '<var:string value="userLanguage" />';</var:if>
 	    <var:string value="commonLocalizableStrings" const:escapeHTML="NO"/>
 	    <var:string value="productLocalizableStrings" const:escapeHTML="NO"/>
 	  </script>
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 0cb8aee6d..19de02eb3 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -849,7 +849,7 @@ function loadMessage(idx) {
 
   var cachedMessage = getCachedMessage(idx);
 	var row = $("row_" + idx);
-	var seenStateChanged = row.hasClassName('mailer_unreadmail');
+	var seenStateChanged = row && row.hasClassName('mailer_unreadmail');
   if (cachedMessage == null) {
     var url = (ApplicationBaseURL + encodeURI(Mailer.currentMailbox) + "/"
 							 + idx + "/view?noframe=1");