diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java
index af8595798..e1672160a 100644
--- a/src/com/fsck/k9/mail/store/LocalStore.java
+++ b/src/com/fsck/k9/mail/store/LocalStore.java
@@ -2081,6 +2081,12 @@ public class LocalStore extends Store implements Serializable
             this.mAttachmentCount = cursor.getInt(10);
             this.setInternalDate(new Date(cursor.getLong(11)));
             this.setMessageId(cursor.getString(12));
+            if (this.getFolder() == null)
+            {
+                LocalFolder f = new LocalFolder(cursor.getInt(13));
+                f.open(LocalFolder.OpenMode.READ_WRITE);
+                this.mFolder = f;
+            }
         }