From 6dcb10add6abc0067a739da66d0f26de0c1f97cc Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Sun, 27 Dec 2009 16:53:31 +0000
Subject: [PATCH] Lift our column list for "load messages" out to the
 LocalStore, as the first part of lifting "get messages" out of "folder" for
 search

---
 src/com/fsck/k9/mail/store/LocalStore.java | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java
index 091c5c2b1..dcc327664 100644
--- a/src/com/fsck/k9/mail/store/LocalStore.java
+++ b/src/com/fsck/k9/mail/store/LocalStore.java
@@ -49,6 +49,14 @@ public class LocalStore extends Store implements Serializable
         HEADERS_TO_SAVE.add("References");
         HEADERS_TO_SAVE.add("X-User-Agent");
     }
+    /*
+     * a String containing the columns getMessages expects to work with
+     * in the correct order.
+     */
+    static private String GET_MESSAGES_COLS =
+        "subject, sender_list, date, uid, flags, id, to_list, cc_list, "
+        + "bcc_list, reply_to_list, attachment_count, internal_date, message_id, folder_id ";
+
 
     /**
      * @param uri local://localhost/path/to/database/uuid.db
@@ -561,15 +569,6 @@ public class LocalStore extends Store implements Serializable
         private String prefId = null;
         private String mPushState = null;
 
-        /*
-         * a String containing the columns getMessages expects to work with
-         * in the correct order.
-         */
-        private String GET_MESSAGES_COLS =
-
-            "subject, sender_list, date, uid, flags, id, to_list, cc_list, "
-            + "bcc_list, reply_to_list, attachment_count, internal_date, message_id ";
-
 
         public LocalFolder(String name)
         {