Lexicographic sort of folder names

app/src/main/java/eu/faircode/email/EntityFolder.java

@@ -36,6 +36,7 @@ import org.json.JSONObject;
 
 import java.io.Serializable;
 import java.text.Collator;
+import java.text.Normalizer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -841,7 +842,8 @@ public class EntityFolder extends EntityOrder implements Serializable {
 
                 String name1 = f1.getDisplayName(context);
                 String name2 = f2.getDisplayName(context);
-                return collator.compare(name1, name2);
+                return Normalizer.normalize(name1, Normalizer.Form.NFD).compareTo(
+                        Normalizer.normalize(name2, Normalizer.Form.NFD));
             }
         };
     }