diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9beaa7dbc..a60a63f18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,9 +67,9 @@ option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE)
 
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets)
 set(LIBGRAVATAR_VERSION_LIB "5.12.40")
-set(MAILCOMMON_LIB_VERSION_LIB "5.12.44")
+set(MAILCOMMON_LIB_VERSION_LIB "5.12.46")
 set(KDEPIM_APPS_LIB_VERSION_LIB "5.12.40")
-set(MESSAGELIB_LIB_VERSION_LIB "5.12.57")
+set(MESSAGELIB_LIB_VERSION_LIB "5.12.59")
 set(LIBKLEO_LIB_VERSION_LIB "5.12.40")
 set(PIMCOMMON_LIB_VERSION_LIB "5.12.40")
 set(LIBKDEPIM_LIB_VERSION_LIB "5.12.40")
diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp
index dfc8300f0..ecc5477fc 100644
--- a/src/editor/kmcomposerwin.cpp
+++ b/src/editor/kmcomposerwin.cpp
@@ -99,7 +99,7 @@
 #include <MailCommon/FolderRequester>
 #include <MailCommon/FolderSettings>
 #include <MailCommon/MailKernel>
-#include <MailCommon/SnippetWidget>
+#include <MailCommon/SnippetTreeView>
 #include <MailCommon/SnippetsManager>
 
 
@@ -383,8 +383,8 @@ KMComposerWin::KMComposerWin(const KMime::Message::Ptr &aMsg, bool lastSignState
     connect(composerEditorNg, &KMComposerEditorNg::spellCheckStatus, this, &KMComposerWin::slotSpellCheckingStatus);
     connect(composerEditorNg, &KMComposerEditorNg::insertModeChanged, this, &KMComposerWin::slotOverwriteModeChanged);
     connect(composerEditorNg, &KMComposerEditorNg::spellCheckingFinished, this, &KMComposerWin::slotDelayedCheckSendNow);
-    mSnippetWidget = new MailCommon::SnippetWidget(actionCollection(), mSnippetSplitter);
-    connect(mSnippetWidget, &MailCommon::SnippetWidget::insertSnippetText, this, &KMComposerWin::insertSnippetText);
+    mSnippetWidget = new MailCommon::SnippetTreeView(actionCollection(), mSnippetSplitter);
+    connect(mSnippetWidget, &MailCommon::SnippetTreeView::insertSnippetText, this, &KMComposerWin::insertSnippetText);
     connect(composerEditorNg, &KMComposerEditorNg::insertSnippet, mSnippetWidget->snippetsManager(), &MailCommon::SnippetsManager::insertSnippet);
     mSnippetWidget->setVisible(KMailSettings::self()->showSnippetManager());
     mSnippetSplitter->addWidget(mSnippetWidget);
diff --git a/src/editor/kmcomposerwin.h b/src/editor/kmcomposerwin.h
index 4620b6d60..4cff467e3 100644
--- a/src/editor/kmcomposerwin.h
+++ b/src/editor/kmcomposerwin.h
@@ -97,7 +97,7 @@ class StatusBarLabelToggledState;
 
 namespace MailCommon {
 class FolderRequester;
-class SnippetWidget;
+class SnippetTreeView;
 }
 
 namespace PimCommon {
@@ -637,7 +637,7 @@ private:
 
     MessageComposer::ComposerViewBase *mComposerBase = nullptr;
 
-    MailCommon::SnippetWidget *mSnippetWidget = nullptr;
+    MailCommon::SnippetTreeView *mSnippetWidget = nullptr;
     PimCommon::CustomToolsWidgetNg *mCustomToolsWidget = nullptr;
     AttachmentMissingWarning *mAttachmentMissing = nullptr;
     ExternalEditorWarning *mExternalEditorWarning = nullptr;