From 78498d154ad109181491c328a496ba1a08636e24 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 19 Jan 2020 08:38:44 +0100
Subject: [PATCH] Manual sync system folders first

---
 app/src/main/java/eu/faircode/email/FragmentMessages.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index fdc4cae413..ddca0138d5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1306,9 +1306,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                     db.beginTransaction();
 
                     List<EntityFolder> folders = new ArrayList<>();
-                    if (fid < 0)
+                    if (fid < 0) {
                         folders.addAll(db.folder().getFoldersUnified(type, type == null));
-                    else {
+                        if (folders.size() > 0)
+                            Collections.sort(folders, folders.get(0).getComparator(context));
+                    } else {
                         EntityFolder folder = db.folder().getFolder(fid);
                         if (folder != null)
                             folders.add(folder);