diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index 2a5b5253421c..cc4aaa877b2a 100644
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -279,15 +279,7 @@ public static Vector<OCFile> sortOCFilesByDate(Vector<OCFile> files){
         
         Collections.sort(files, new Comparator<OCFile>() {
             public int compare(OCFile o1, OCFile o2) {
-                if (o1.isFolder() && o2.isFolder()) {
-                    Long obj1 = o1.getModificationTimestamp();
-                    return multiplier * obj1.compareTo(o2.getModificationTimestamp());
-                }
-                else if (o1.isFolder()) {
-                    return -1;
-                } else if (o2.isFolder()) {
-                    return 1;
-                } else if (o1.getModificationTimestamp() == 0 || o2.getModificationTimestamp() == 0){
+                if (o1.getModificationTimestamp() == 0 || o2.getModificationTimestamp() == 0){
                     return 0;
                 } else {
                     Long obj1 = o1.getModificationTimestamp();
@@ -310,15 +302,7 @@ public static File[] sortLocalFilesByDate(File[] filesArray){
 
         Collections.sort(files, new Comparator<File>() {
             public int compare(File o1, File o2) {
-                if (o1.isDirectory() && o2.isDirectory()) {
-                    Long obj1 = o1.lastModified();
-                    return multiplier * obj1.compareTo(o2.lastModified());
-                }
-                else if (o1.isDirectory()) {
-                    return -1;
-                } else if (o2.isDirectory()) {
-                    return 1;
-                } else if (o1.lastModified() == 0 || o2.lastModified() == 0){
+                if (o1.lastModified() == 0 || o2.lastModified() == 0){
                     return 0;
                 } else {
                     Long obj1 = o1.lastModified();