diff --git a/messageviewer/src/viewer/objecttreeparser.h b/messageviewer/src/viewer/objecttreeparser.h
--- a/messageviewer/src/viewer/objecttreeparser.h
+++ b/messageviewer/src/viewer/objecttreeparser.h
@@ -288,13 +288,13 @@
 public:
     explicit ObjectTreeParser(ObjectTreeSourceIf *source,
                               NodeHelper *nodeHelper = 0,
-                              const Kleo::CryptoBackend::Protocol *protocol = 0,
-                              bool showOneMimePart = false, bool keepEncryptions = false,
-                              const AttachmentStrategy *attachmentStrategy = 0);
+                              const Kleo::CryptoBackend::Protocol *protocol = Q_NULLPTR,
+                              bool showOneMimePart = false,
+                              const AttachmentStrategy *attachmentStrategy = Q_NULLPTR);
 
     explicit ObjectTreeParser(const ObjectTreeParser *topLevelParser,
-                              bool showOneMimePart = false, bool keepEncryptions = false,
-                              const AttachmentStrategy *attachmentStrategy = 0);
+                              bool showOneMimePart = false,
+                              const AttachmentStrategy *attachmentStrategy = Q_NULLPTR);
     virtual ~ObjectTreeParser();
 
     void setAllowAsync(bool allow);
@@ -343,9 +343,6 @@
     bool showOnlyOneMimePart() const;
     void setShowOnlyOneMimePart(bool show);
 
-    bool keepEncryptions() const;
-    void setKeepEncryptions(bool keep);
-
     const AttachmentStrategy *attachmentStrategy() const;
 
     HtmlWriter *htmlWriter() const;
@@ -504,7 +501,6 @@
     /// the children can be completely displayed again.
     bool mShowOnlyOneMimePart;
 
-    bool mKeepEncryptions;
     bool mHasPendingAsyncJobs;
     bool mAllowAsync;
     const AttachmentStrategy *mAttachmentStrategy;
diff --git a/messageviewer/src/viewer/objecttreeparser.cpp b/messageviewer/src/viewer/objecttreeparser.cpp
--- a/messageviewer/src/viewer/objecttreeparser.cpp
+++ b/messageviewer/src/viewer/objecttreeparser.cpp
@@ -145,15 +145,14 @@
 };
 
 ObjectTreeParser::ObjectTreeParser(const ObjectTreeParser *topLevelParser,
-                                   bool showOnlyOneMimePart, bool keepEncryptions,
+                                   bool showOnlyOneMimePart,
                                    const AttachmentStrategy *strategy)
     : mSource(topLevelParser->mSource),
       mNodeHelper(topLevelParser->mNodeHelper),
       mHtmlWriter(topLevelParser->mHtmlWriter),
       mTopLevelContent(topLevelParser->mTopLevelContent),
       mCryptoProtocol(topLevelParser->mCryptoProtocol),
       mShowOnlyOneMimePart(showOnlyOneMimePart),
-      mKeepEncryptions(keepEncryptions),
       mHasPendingAsyncJobs(false),
       mAllowAsync(topLevelParser->mAllowAsync),
       mAttachmentStrategy(strategy),
@@ -165,15 +164,14 @@
 ObjectTreeParser::ObjectTreeParser(ObjectTreeSourceIf *source,
                                    MessageViewer::NodeHelper *nodeHelper,
                                    const Kleo::CryptoBackend::Protocol *protocol,
-                                   bool showOnlyOneMimePart, bool keepEncryptions,
+                                   bool showOnlyOneMimePart,
                                    const AttachmentStrategy *strategy)
     : mSource(source),
       mNodeHelper(nodeHelper),
       mHtmlWriter(0),
       mTopLevelContent(0),
       mCryptoProtocol(protocol),
       mShowOnlyOneMimePart(showOnlyOneMimePart),
-      mKeepEncryptions(keepEncryptions),
       mHasPendingAsyncJobs(false),
       mAllowAsync(false),
       mAttachmentStrategy(strategy),
@@ -204,7 +202,6 @@
       mTopLevelContent(other.mTopLevelContent),
       mCryptoProtocol(other.cryptoProtocol()),
       mShowOnlyOneMimePart(other.showOnlyOneMimePart()),
-      mKeepEncryptions(other.keepEncryptions()),
       mHasPendingAsyncJobs(other.hasPendingAsyncJobs()),
       mAllowAsync(other.allowAsync()),
       mAttachmentStrategy(other.attachmentStrategy()),
@@ -1228,16 +1225,6 @@
         return false;
     }
 
-    if (keepEncryptions()) {
-        mNodeHelper->setEncryptionState(node, KMMsgFullyEncrypted);
-        const QByteArray cstr = node->decodedContent();
-        if (htmlWriter()) {
-            writeBodyString(cstr, NodeHelper::fromAsString(node),
-                            codecFor(node), result, false);
-        }
-        return true;
-    }
-
     const Kleo::CryptoBackend::Protocol *useThisCryptProto = 0;
 
     /*
@@ -3010,16 +2997,6 @@
     mShowOnlyOneMimePart = show;
 }
 
-bool ObjectTreeParser::keepEncryptions() const
-{
-    return mKeepEncryptions;
-}
-
-void ObjectTreeParser::setKeepEncryptions(bool keep)
-{
-    mKeepEncryptions = keep;
-}
-
 const AttachmentStrategy *ObjectTreeParser::attachmentStrategy() const
 {
     return mAttachmentStrategy;