diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,7 +68,7 @@
 
 set(KDEPIMRUNTIME_LIB_VERSION "${KDEPIM_RUNTIME_VERSION_NUMBER}")
 set(KDEPIMRUNTIME_LIB_SOVERSION "5")
-set(AKONADI_VERSION "5.13.40")
+set(AKONADI_VERSION "5.13.41")
 
 set(IDENTITYMANAGEMENT_LIB_VERSION "5.13.40")
 set(KMAILTRANSPORT_LIB_VERSION "5.13.40")
diff --git a/resources/ews/ewssubscriptionwidget.cpp b/resources/ews/ewssubscriptionwidget.cpp
--- a/resources/ews/ewssubscriptionwidget.cpp
+++ b/resources/ews/ewssubscriptionwidget.cpp
@@ -24,19 +24,19 @@
 #include <QHeaderView>
 #include <QLineEdit>
 #include <QPushButton>
+#include <QSortFilterProxyModel>
 #include <QStandardItemModel>
 #include <QTreeView>
 #include <QVBoxLayout>
 
 #include <KMessageWidget>
 #include <KLocalizedString>
-#include <KRecursiveFilterProxyModel>
 #include "ewsclient.h"
 #include "ewsfindfolderrequest.h"
 #include "ewssubscribedfoldersjob.h"
 #include "ewssettings.h"
 
-class EwsSubscriptionFilterModel : public KRecursiveFilterProxyModel
+class EwsSubscriptionFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 public:
@@ -95,9 +95,10 @@
 };
 
 EwsSubscriptionFilterModel::EwsSubscriptionFilterModel(QObject *parent)
-    : KRecursiveFilterProxyModel(parent)
+    : QSortFilterProxyModel(parent)
     , mFilterSelected(false)
 {
+    setRecursiveFilteringEnabled(true);
 }
 
 EwsSubscriptionFilterModel::~EwsSubscriptionFilterModel()
@@ -117,7 +118,7 @@
     if (!show) {
         return false;
     } else {
-        return KRecursiveFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
+        return QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
     }
 }
 
diff --git a/resources/imap/subscriptiondialog.h b/resources/imap/subscriptiondialog.h
--- a/resources/imap/subscriptiondialog.h
+++ b/resources/imap/subscriptiondialog.h
@@ -23,8 +23,8 @@
 #define SUBSCRIPTIONDIALOG_H
 
 #include <QDialog>
+#include <QSortFilterProxyModel>
 
-#include <krecursivefilterproxymodel.h>
 #include <kimap/listjob.h>
 
 #include <QMap>
@@ -38,7 +38,7 @@
 class QTreeView;
 class QPushButton;
 
-class SubscriptionFilterProxyModel : public KRecursiveFilterProxyModel
+class SubscriptionFilterProxyModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 public:
@@ -50,7 +50,7 @@
     void setIncludeCheckedOnly(int checkedOnlyState);
 
 protected:
-    bool acceptRow(int sourceRow, const QModelIndex &sourceParent) const override;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
 
 private:
     QString m_pattern;
diff --git a/resources/imap/subscriptiondialog.cpp b/resources/imap/subscriptiondialog.cpp
--- a/resources/imap/subscriptiondialog.cpp
+++ b/resources/imap/subscriptiondialog.cpp
@@ -325,8 +325,9 @@
 }
 
 SubscriptionFilterProxyModel::SubscriptionFilterProxyModel(QObject *parent)
-    : KRecursiveFilterProxyModel(parent)
+    : QSortFilterProxyModel(parent)
 {
+    setRecursiveFilteringEnabled(true);
 }
 
 void SubscriptionFilterProxyModel::setSearchPattern(const QString &pattern)
@@ -351,7 +352,7 @@
     invalidate();
 }
 
-bool SubscriptionFilterProxyModel::acceptRow(int sourceRow, const QModelIndex &sourceParent) const
+bool SubscriptionFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
 {
     QModelIndex sourceIndex = sourceModel()->index(sourceRow, 0, sourceParent);