diff --git a/ChangeLog b/ChangeLog
index 145fe1899..fd0368327 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-06  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/generic.js (getListIndexForFolder): the
+	personal folder now stays on top, as returned by the server.
+
 2011-10-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoObject.m (-davComplianceClassesInContext:):
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 5791e13c1..d1584d020 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1215,6 +1215,7 @@ function getListIndexForFolder(items, owner, folderName) {
     var previousOwner = null;
 
     for (i = 0; i < items.length; i++) {
+        if (items[i].id == '/personal') continue;
         var currentFolderName = items[i].lastChild.nodeValue.strip();
         var currentOwner = items[i].readAttribute('owner');
         if (currentOwner == owner) {