From f6a2d3c59c52f4892af84855027b3a5d1a251ef3 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 2 Feb 2019 19:51:21 +0000
Subject: [PATCH] Refactoring

---
 .../main/java/eu/faircode/email/AdapterMessage.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index e12b02c49d..539ba9abc4 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -789,18 +789,17 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         if (amessage == null || !amessage.id.equals(id))
                             return;
 
-                        boolean hasJunk = false;
-                        boolean hasTrash = false;
                         boolean hasArchive = false;
-
+                        boolean hasTrash = false;
+                        boolean hasJunk = false;
                         if (folders != null)
                             for (EntityFolder folder : folders) {
-                                if (EntityFolder.JUNK.equals(folder.type))
-                                    hasJunk = true;
+                                if (EntityFolder.ARCHIVE.equals(folder.type))
+                                    hasArchive = true;
                                 else if (EntityFolder.TRASH.equals(folder.type))
                                     hasTrash = true;
-                                else if (EntityFolder.ARCHIVE.equals(folder.type))
-                                    hasArchive = true;
+                                else if (EntityFolder.JUNK.equals(folder.type))
+                                    hasJunk = true;
                             }
 
                         boolean inOutbox = EntityFolder.OUTBOX.equals(message.folderType);