First categorize accounts

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

@@ -302,6 +302,14 @@ public class AdapterNavAccountFolder extends RecyclerView.Adapter<AdapterNavAcco
                 public int compare(TupleAccountFolder a1, TupleAccountFolder a2) {
                     // Account
 
+                    if (nav_categories) {
+                        int c = collator.compare(
+                                a1.category == null ? "" : a1.category,
+                                a2.category == null ? "" : a2.category);
+                        if (c != 0)
+                            return c;
+                    }
+
                     int a = Integer.compare(
                             a1.order == null ? -1 : a1.order,
                             a2.order == null ? -1 : a2.order);
@@ -312,14 +320,6 @@ public class AdapterNavAccountFolder extends RecyclerView.Adapter<AdapterNavAcco
                     if (p != 0)
                         return p;
 
-                    if (nav_categories) {
-                        int c = collator.compare(
-                                a1.category == null ? "" : a1.category,
-                                a2.category == null ? "" : a2.category);
-                        if (c != 0)
-                            return c;
-                    }
-
                     int n = collator.compare(a1.name, a2.name);
                     if (n != 0)
                         return n;

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

@@ -74,9 +74,9 @@ public interface DaoAccount {
             " LEFT JOIN folder AS sent ON sent.account = account.id AND sent.type = '" + EntityFolder.SENT + "'" +
             " WHERE :all OR account.synchronize" +
             " GROUP BY account.id" +
-            " ORDER BY account.`order`" +
+            " ORDER BY account.category COLLATE NOCASE" +
+            ", account.`order`" +
             ", account.`primary` DESC" +
-            ", account.category COLLATE NOCASE" +
             ", account.name COLLATE NOCASE")
     LiveData<List<TupleAccountEx>> liveAccountsEx(boolean all);