From 48c3fbd2ba84da5ee7760ce6055ea07173f9b49a Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Sun, 31 Mar 2013 01:35:38 +0100
Subject: [PATCH] Don't crash when being started by an old unread widget intent

---
 src/com/fsck/k9/activity/MessageList.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 3adc8e40d..b3bde3e9c 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -427,6 +427,18 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
             mSearch.addAllowedFolder(mMessageReference.folderName);
         }
 
+        if (mSearch == null) {
+            // We've most likely been started by an old unread widget
+            String accountUuid = intent.getStringExtra("account");
+            String folderName = intent.getStringExtra("folder");
+
+            mSearch = new LocalSearch(folderName);
+            mSearch.addAccountUuid(accountUuid);
+            if (folderName != null) {
+                mSearch.addAllowedFolder(folderName);
+            }
+        }
+
         String[] accountUuids = mSearch.getAccountUuids();
         mSingleAccountMode = (accountUuids.length == 1 && !mSearch.searchAllAccounts());
         mSingleFolderMode = mSingleAccountMode && (mSearch.getFolderNames().size() == 1);