Properly sort rules

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

@@ -31,7 +31,7 @@ import androidx.room.Update;
 public interface DaoRule {
     @Query("SELECT * FROM rule" +
             " WHERE folder = :folder" +
-            " ORDER BY `order`")
+            " ORDER BY `order`, name")
     List<EntityRule> getRules(long folder);
 
     @Query("SELECT * FROM rule" +
@@ -49,7 +49,8 @@ public interface DaoRule {
     @Query("SELECT rule.*, folder.account, folder.name AS folderName, account.name AS accountName FROM rule" +
             " JOIN folder ON folder.id = rule.folder" +
             " JOIN account ON account.id = folder.account" +
-            " WHERE rule.folder = :folder")
+            " WHERE rule.folder = :folder" +
+            " ORDER BY `order`, name")
     LiveData<List<TupleRuleEx>> liveRules(long folder);
 
     @Insert