Skip auto expanding drafts/trashed messages

5 years ago · 6487ad6c3e
parent 0a93587cce
commit 6487ad6c3e
1 changed files with 5 additions and 1 deletions
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@ -4270,7 +4270,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
            boolean expand_all = prefs.getBoolean("expand_all", false);
            if (expand_all)
                for (TupleMessageEx message : messages)
-                    if (message != null && message.ui_seen && !message.duplicate)
+                    if (message != null &&
+                            message.ui_seen &&
+                            !message.duplicate &&
+                            !EntityFolder.DRAFTS.equals(message.folderType) &&
+                            !EntityFolder.TRASH.equals(message.folderType))
                        iProperties.setExpanded(message, true);
        } else {
            if (autoCloseCount > 0 && (autoclose || onclose != null)) {