From 734cbf856d5c9b604bbd3c2f275f25648635b608 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Sun, 16 Jan 2011 21:33:50 +0000
Subject: [PATCH] Simplify the logic for "should I search this folder" using
 our new helper

---
 src/com/fsck/k9/controller/MessagingController.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index abee62a64..8922d2f7b 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -848,12 +848,8 @@ public class MessagingController implements Runnable
                                 }
                             }
                             // Never exclude the INBOX (see issue 1817)
-                            else if (noSpecialFolders && !localFolderName.equals(K9.INBOX) && (
-                                         localFolderName.equals(account.getTrashFolderName()) ||
-                                         localFolderName.equals(account.getOutboxFolderName()) ||
-                                         localFolderName.equals(account.getDraftsFolderName()) ||
-                                         localFolderName.equals(account.getSentFolderName()) ||
-                                         localFolderName.equals(account.getErrorFolderName())))
+                            else if (noSpecialFolders && !localFolderName.equalsIgnoreCase(K9.INBOX) &&
+                                     !localFolderName.equals(account.getArchiveFolderName()) && account.isSpecialFolder(localFolderName))
                             {
                                 include = false;
                             }