From b96e7bb0585eba74a8507f11dee659b3a8f0ec08 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Thu, 22 Nov 2012 22:50:13 +0100
Subject: [PATCH] Fix NPE related to changed initialization order in Android
 4.2

---
 src/com/fsck/k9/fragment/MessageViewFragment.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/fsck/k9/fragment/MessageViewFragment.java b/src/com/fsck/k9/fragment/MessageViewFragment.java
index 768d63d53..d87307df5 100644
--- a/src/com/fsck/k9/fragment/MessageViewFragment.java
+++ b/src/com/fsck/k9/fragment/MessageViewFragment.java
@@ -539,8 +539,10 @@ public class MessageViewFragment extends SherlockFragment implements OnClickList
     }
 
     private void configureMenu(Menu menu) {
-        // first run displayMessage() gets called before onCreateOptionMenu()
-        if (menu == null) {
+        // In Android versions prior to 4.2 onCreateOptionsMenu() (which calls us) is called before
+        // onActivityCreated() when mAccount isn't initialized yet. In that case we do nothing and
+        // wait for displayMessage() to call us again.
+        if (menu == null || mAccount == null) {
             return;
         }