From 9ac2c8922e93c7b829a9a01f41f794d5f4acd58d Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Tue, 13 Jan 2015 13:21:50 +0100
Subject: [PATCH 1/2] Show action when we have a valid message

---
 kmreadermainwin.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kmreadermainwin.cpp b/kmreadermainwin.cpp
index 4e4000aa0..23da107f2 100644
--- a/kmreadermainwin.cpp
+++ b/kmreadermainwin.cpp
@@ -590,7 +590,8 @@ void KMReaderMainWin::showMessagePopup(const Akonadi::Item&msg ,const KUrl&url,c
             menu->addSeparator();
             menu->addAction( mReaderWin->openBlockableItems());
         }
-        menu->addAction( mMsgActions->addFollowupReminderAction() );
+        if (msg.isValid())
+            menu->addAction( mMsgActions->addFollowupReminderAction() );
         if (kmkernel->allowToDebugBalooSupport()) {
             menu->addSeparator();
             menu->addAction( mMsgActions->debugBalooAction() );

From e92c90dfada62e8b4f7bc75530aa8270eed6be2a Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Tue, 13 Jan 2015 13:38:32 +0100
Subject: [PATCH 2/2] Don't show mimetreeview if model is empty (as when we
 show a patch in kmail)

---
 kmreadermainwin.cpp | 6 ++++--
 kmreaderwin.cpp     | 5 +++++
 kmreaderwin.h       | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/kmreadermainwin.cpp b/kmreadermainwin.cpp
index 23da107f2..6d3b3c57d 100644
--- a/kmreadermainwin.cpp
+++ b/kmreadermainwin.cpp
@@ -567,7 +567,8 @@ void KMReaderMainWin::showMessagePopup(const Akonadi::Item&msg ,const KUrl&url,c
 
             menu->addAction( mReaderWin->viewSourceAction() );
             menu->addAction( mReaderWin->toggleFixFontAction() );
-            menu->addAction( mReaderWin->toggleMimePartTreeAction() );
+            if (!mReaderWin->mimePartTreeIsEmpty())
+                menu->addAction( mReaderWin->toggleMimePartTreeAction() );
             menu->addSeparator();
             if (mMsgActions->printPreviewAction())
                 menu->addAction( mMsgActions->printPreviewAction() );
@@ -584,7 +585,8 @@ void KMReaderMainWin::showMessagePopup(const Akonadi::Item&msg ,const KUrl&url,c
             }
         } else {
             menu->addAction( mReaderWin->toggleFixFontAction() );
-            menu->addAction( mReaderWin->toggleMimePartTreeAction() );
+            if (!mReaderWin->mimePartTreeIsEmpty())
+                menu->addAction( mReaderWin->toggleMimePartTreeAction() );
         }
         if (mReaderWin->adblockEnabled()) {
             menu->addSeparator();
diff --git a/kmreaderwin.cpp b/kmreaderwin.cpp
index e70aab343..f87be6ef3 100644
--- a/kmreaderwin.cpp
+++ b/kmreaderwin.cpp
@@ -613,6 +613,11 @@ KToggleAction *KMReaderWin::toggleFixFontAction() const
     return mViewer->toggleFixFontAction();
 }
 
+bool KMReaderWin::mimePartTreeIsEmpty() const
+{
+    return mViewer->mimePartTreeIsEmpty();
+}
+
 KAction *KMReaderWin::toggleMimePartTreeAction() const
 {
     return mViewer->toggleMimePartTreeAction();
diff --git a/kmreaderwin.h b/kmreaderwin.h
index 6cf3181f7..263dba94c 100644
--- a/kmreaderwin.h
+++ b/kmreaderwin.h
@@ -182,6 +182,7 @@ public:
     bool adblockEnabled() const;
     bool isAShortUrl(const KUrl &url) const;
 
+    bool mimePartTreeIsEmpty() const;
 signals:
     /** Emitted after parsing of a message to have it stored
       in unencrypted state in it's folder. */