diff --git a/src/com/android/email/activity/MessageList.java b/src/com/android/email/activity/MessageList.java
index 714a59238..7e018d7e9 100644
--- a/src/com/android/email/activity/MessageList.java
+++ b/src/com/android/email/activity/MessageList.java
@@ -527,7 +527,9 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
         // TODO: Should not be reading from DB in UI thread - need a cleaner way to get accountId
         if (mMailboxId >= 0) {
             Mailbox mailbox = Mailbox.restoreMailboxWithId(this, mMailboxId);
-            mController.updateMailbox(mailbox.mAccountKey, mMailboxId, mControllerCallback);
+            if (mailbox != null) {
+                mController.updateMailbox(mailbox.mAccountKey, mMailboxId, mControllerCallback);
+            }
         }
     }