From 33a2b05701436613b4dc305c7b7554db4f756dcc Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Sun, 31 Mar 2013 01:13:09 +0100
Subject: [PATCH] Get rid of accidentally created "-NONE-" folder

---
 src/com/fsck/k9/controller/MessagingController.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index 5ea3156b5..5379dd04a 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -641,7 +641,15 @@ public class MessagingController implements Runnable {
                      */
                     for (Folder localFolder : localFolders) {
                         String localFolderName = localFolder.getName();
-                        if (!account.isSpecialFolder(localFolderName) && !remoteFolderNames.contains(localFolderName)) {
+
+                        // FIXME: This is a hack used to clean up when we accidentally created the
+                        //        special placeholder folder "-NONE-".
+                        if (K9.FOLDER_NONE.equals(localFolderName)) {
+                            localFolder.delete(false);
+                        }
+
+                        if (!account.isSpecialFolder(localFolderName) &&
+                                !remoteFolderNames.contains(localFolderName)) {
                             localFolder.delete(false);
                         }
                     }