diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m
index 4031b49..abe0121 100644
--- a/UI/MainUI/SOGoUserHomePage.m
+++ b/UI/MainUI/SOGoUserHomePage.m
@@ -442,10 +442,12 @@
   [response setStatus: 200];
   [response setHeader: @"text/plain; charset=utf-8"
            forKey: @"Content-Type"];
-  foldersEnum = [folders objectEnumerator];
-  while ((currentFolder = [foldersEnum nextObject]))
-    [response appendContentString:
-               [currentFolder keysWithFormat: @";%{displayName}:%{name}:%{type}:%{formattedName}"]];
+
+  [response appendContentString: [folders JSONRepresentation]];
+  //  foldersEnum = [folders objectEnumerator];
+  //while ((currentFolder = [foldersEnum nextObject]))
+  //  [response appendContentString:
+  //[currentFolder keysWithFormat: @";%{displayName}:%{name}:%{type}:%{formattedName}"]];

   return response;
 }
diff --git a/UI/WebServerResources/UIxContactsUserFolders.js b/UI/WebServerResources/UIxContactsUserFolders.js
index d664578..7bcc228 100644
--- a/UI/WebServerResources/UIxContactsUserFolders.js
+++ b/UI/WebServerResources/UIxContactsUserFolders.js
@@ -159,11 +159,12 @@ function foldersSearchCallback(http) {

         var dd = $("dd" + nodeId);
         if (response.length) {
-            var folders = response.split(";");
+            //var folders = response.split(";");
+            var folders = response.evalJSON();
             var user = http.callbackData["user"];

             dd.innerHTML = '';
-            for (var i = 1; i < folders.length - 1; i++)
+            for (var i = 0; i < folders.length-1; i++)
                 dd.appendChild(addFolderBranchToTree(d, user, folders[i], nodeId, i, false));
             dd.appendChild(addFolderBranchToTree(d, user, folders[folders.length-1], nodeId,
                                                  (folders.length - 1), true));
@@ -185,22 +186,21 @@ function foldersSearchCallback(http) {
 }

 function addFolderBranchToTree(tree, user, folder, nodeId, subId, isLast) {
-    var folderInfos = folder.split(":");
     var icon = ResourcesURL + '/';
-    if (folderInfos[2] == 'Contact')
+    if (folder.type == 'Contact')
         icon += 'tb-mail-addressbook-flat-16x16.png';
     else
         icon += 'calendar-folder-16x16.png';
-    var folderId = user + ":" + folderInfos[1].substr(1);
+    var folderId = user + ":" + folder.name.substr(1);

     // We sanitize the value to avoid XSS issues
-    var name = folderInfos[0].escapeHTML();
+    var name = folder.displayName.escapeHTML();
     var node = new dTreeNode(subId, nodeId, name, 0, '#', folderId,
-                             folderInfos[2] + '-folder', '', '', icon, icon);
+                             folder.type + '-folder', '', '', icon, icon);
     node._ls = isLast;

     var content = tree.node(node, (nodeId + subId), null);
-    content._formattedName = folderInfos[3];
+    content._formattedName = folder.formattedName;

     return content;
 }