diff --git a/src/com/android/email/activity/UIControllerTwoPane.java b/src/com/android/email/activity/UIControllerTwoPane.java index 93a08e4c0..9794e497c 100644 --- a/src/com/android/email/activity/UIControllerTwoPane.java +++ b/src/com/android/email/activity/UIControllerTwoPane.java @@ -487,7 +487,9 @@ class UIControllerTwoPane implements * for the mailbox list. The two may be different. */ public long getMessageListMailboxId() { - return mMessageListFragment.getMailboxId(); + return (mMessageListFragment == null) + ? Mailbox.NO_MAILBOX + : mMessageListFragment.getMailboxId(); } public long getMessageId() {