From 1d849f66644fedbe693d7581d90453c4cc881e7b Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Wed, 6 Feb 2013 10:40:23 +0100
Subject: [PATCH] Fix message view menu items being present after displaying a
 message and going back.

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

diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 5c227ab33..30c99fd68 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -906,7 +906,9 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
          * Set visibility of menu items related to the message view
          */
 
-        if (mMessageViewFragment == null || !mMessageViewFragment.isInitialized()) {
+        if (mDisplayMode == DisplayMode.MESSAGE_LIST
+                || mMessageViewFragment == null
+                || !mMessageViewFragment.isInitialized()) {
             menu.findItem(R.id.next_message).setVisible(false);
             menu.findItem(R.id.previous_message).setVisible(false);
             menu.findItem(R.id.delete).setVisible(false);
@@ -1365,6 +1367,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
         mMessageListFragment.setActiveMessage(null);
 
         showDefaultTitleView();
+        configureMenu(mMenu);
     }
 
     private void showMessageView() {
@@ -1376,6 +1379,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
         mViewSwitcher.showSecondView();
 
         showMessageTitleView();
+        configureMenu(mMenu);
     }
 
     @Override