diff --git a/CMakeLists.txt b/CMakeLists.txt
index 499a08220..3f8056976 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,7 +67,7 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widget
 set(LIBGRAVATAR_VERSION_LIB "5.6.80")
 set(MAILCOMMON_LIB_VERSION_LIB "5.6.80")
 set(KDEPIM_APPS_LIB_VERSION_LIB "5.6.80")
-set(MESSAGELIB_LIB_VERSION_LIB "5.6.80")
+set(MESSAGELIB_LIB_VERSION_LIB "5.6.81")
 set(LIBKLEO_LIB_VERSION_LIB "5.6.80")
 set(PIMCOMMON_LIB_VERSION_LIB "5.6.80")
 set(LIBKDEPIM_LIB_VERSION_LIB "5.6.80")
diff --git a/src/kmcommands.cpp b/src/kmcommands.cpp
index 188fca7d5..0c7392609 100644
--- a/src/kmcommands.cpp
+++ b/src/kmcommands.cpp
@@ -1121,7 +1121,7 @@ void KMPrintCommand::setOverrideFont(const QFont &font)
     mOverrideFont = font;
 }
 
-void KMPrintCommand::setAttachmentStrategy(const MimeTreeParser::AttachmentStrategy *strategy)
+void KMPrintCommand::setAttachmentStrategy(const MessageViewer::AttachmentStrategy *strategy)
 {
     mAttachmentStrategy = strategy;
 }
diff --git a/src/kmcommands.h b/src/kmcommands.h
index 3303728c5..016090b16 100644
--- a/src/kmcommands.h
+++ b/src/kmcommands.h
@@ -385,14 +385,14 @@ public:
                    const QString &encoding = QString());
 
     void setOverrideFont(const QFont &);
-    void setAttachmentStrategy(const MimeTreeParser::AttachmentStrategy *strategy);
+    void setAttachmentStrategy(const MessageViewer::AttachmentStrategy *strategy);
     void setPrintPreview(bool preview);
 
 private:
     Result execute() override;
 
     MessageViewer::HeaderStylePlugin *mHeaderStylePlugin = nullptr;
-    const MimeTreeParser::AttachmentStrategy *mAttachmentStrategy = nullptr;
+    const MessageViewer::AttachmentStrategy *mAttachmentStrategy = nullptr;
     QFont mOverrideFont;
     QString mEncoding;
     MessageViewer::Viewer::DisplayFormatMessage mFormat;
diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
index 1531dcce5..b2a39bab7 100644
--- a/src/kmmainwidget.cpp
+++ b/src/kmmainwidget.cpp
@@ -88,7 +88,7 @@ using KSieveUi::SieveDebugDialog;
 #include "messageviewer/headerstyleplugin.h"
 #include "messageviewer/headerstyle.h"
 
-#include <MimeTreeParser/AttachmentStrategy>
+#include <MessageViewer/AttachmentStrategy>
 
 #ifndef QT_NO_CURSOR
 #include "Libkdepim/KCursorSaver"
@@ -198,7 +198,7 @@ using KPIM::ProgressManager;
 using KPIM::BroadcastStatus;
 using KMail::SearchWindow;
 using KMime::Types::AddrSpecList;
-using MimeTreeParser::AttachmentStrategy;
+using MessageViewer::AttachmentStrategy;
 
 Q_GLOBAL_STATIC(KMMainWidget::PtrList, theMainWidgetList)
 
diff --git a/src/kmreaderwin.cpp b/src/kmreaderwin.cpp
index 7ceb316ca..4042e7196 100644
--- a/src/kmreaderwin.cpp
+++ b/src/kmreaderwin.cpp
@@ -53,7 +53,7 @@ using MessageViewer::CSSHelper;
 using namespace MessageViewer;
 #include <MessageCore/MessageCoreSettings>
 
-#include <MimeTreeParser/AttachmentStrategy>
+#include <MessageViewer/AttachmentStrategy>
 #include <MessageComposer/MessageSender>
 #include "MessageComposer/Composer"
 #include "MessageComposer/TextPart"
@@ -232,7 +232,7 @@ void KMReaderWin::readConfig(void)
     mViewer->readConfig();
 }
 
-void KMReaderWin::setAttachmentStrategy(const MimeTreeParser::AttachmentStrategy *strategy)
+void KMReaderWin::setAttachmentStrategy(const MessageViewer::AttachmentStrategy *strategy)
 {
     mViewer->setAttachmentStrategy(strategy);
 }
@@ -524,7 +524,7 @@ void KMReaderWin::setDecryptMessageOverwrite(bool overwrite)
     mViewer->setDecryptMessageOverwrite(overwrite);
 }
 
-const MimeTreeParser::AttachmentStrategy *KMReaderWin::attachmentStrategy() const
+const MessageViewer::AttachmentStrategy *KMReaderWin::attachmentStrategy() const
 {
     return mViewer->attachmentStrategy();
 }
diff --git a/src/kmreaderwin.h b/src/kmreaderwin.h
index af52225cc..ae65b9af0 100644
--- a/src/kmreaderwin.h
+++ b/src/kmreaderwin.h
@@ -60,9 +60,9 @@ public:
     void readConfig();
 
     /** Get/set the message attachment strategy. */
-    const MimeTreeParser::AttachmentStrategy *attachmentStrategy() const;
+    const MessageViewer::AttachmentStrategy *attachmentStrategy() const;
 
-    void setAttachmentStrategy(const MimeTreeParser::AttachmentStrategy *strategy);
+    void setAttachmentStrategy(const MessageViewer::AttachmentStrategy *strategy);
 
     /** Get selected override character encoding.
       @return The encoding selected by the user or an empty string if auto-detection