Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java,v
diff -u -r1.57 -r1.58
--- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	1 Sep 2011 15:00:36 -0000	1.57
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	12 Jun 2013 08:35:13 -0000	1.58
@@ -26,6 +26,8 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -1174,6 +1176,19 @@
 			log.warn("getAccessibleOrganisationWorkspaceFolders: User "+user.getUserId()+" does not exist. Returning no folders.");
 		}
 		
+		//sort folders by their names
+	        Collections.sort(folders, new Comparator<FolderContentDTO>() {
+	            
+	            @Override
+	            public int compare(FolderContentDTO fc1, FolderContentDTO fc2) {
+        		if ((fc1.getName() != null) && (fc2.getName() != null)) {
+        		    return fc1.getName().compareToIgnoreCase(fc2.getName());
+        		}
+	        	//return 1 if either of comparable FolderContentDTOs has a null name
+	        	return 1;
+	            }
+	        });
+	        
 		return folders;
 	}
 	/**