diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64f53e3..675ec7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ set(MAILIMPORTER_LIB_VERSION "5.13.40")
 set(LIBKDEPIM_LIB_VERSION "5.13.40")
 set(PIMCOMMON_LIB_VERSION "5.13.40")
 
-set(AKONADI_VERSION "5.13.40")
+set(AKONADI_VERSION "5.13.41")
 set(AKONADIMIME_LIB_VERSION "5.13.40")
 set(MESSAGELIB_LIB_VERSION "5.13.40")
 set(KMIME_LIB_VERSION "5.13.40")
diff --git a/src/folder/entitycollectionorderproxymodel.h b/src/folder/entitycollectionorderproxymodel.h
index 7db7858..908d632 100644
--- a/src/folder/entitycollectionorderproxymodel.h
+++ b/src/folder/entitycollectionorderproxymodel.h
@@ -20,8 +20,8 @@
 #ifndef MAILCOMMON_ENTITYCOLLECTIONORDERPROXYMODEL_H
 #define MAILCOMMON_ENTITYCOLLECTIONORDERPROXYMODEL_H
 
-#include <EntityOrderProxyModel>
 #include "mailcommon_export.h"
+#include <EntityOrderProxyModel>
 
 namespace MailCommon {
 /**
diff --git a/src/folder/favoritecollectionorderproxymodel.h b/src/folder/favoritecollectionorderproxymodel.h
index de77c9e..91fa6e6 100644
--- a/src/folder/favoritecollectionorderproxymodel.h
+++ b/src/folder/favoritecollectionorderproxymodel.h
@@ -20,8 +20,8 @@
 #ifndef MAILCOMMON_FAVORITECOLLECTIONORDERPROXYMODEL_H
 #define MAILCOMMON_FAVORITECOLLECTIONORDERPROXYMODEL_H
 
-#include <EntityOrderProxyModel>
 #include "mailcommon_export.h"
+#include <EntityOrderProxyModel>
 
 namespace MailCommon {
 /**
diff --git a/src/folder/foldertreewidgetproxymodel.cpp b/src/folder/foldertreewidgetproxymodel.cpp
index b6e7f96..75c08c9 100644
--- a/src/folder/foldertreewidgetproxymodel.cpp
+++ b/src/folder/foldertreewidgetproxymodel.cpp
@@ -126,7 +126,7 @@ Qt::ItemFlags FolderTreeWidgetProxyModel::flags(const QModelIndex &index) const
         if (!MailCommon::Util::isVirtualCollection(collection)) {
             const Akonadi::AgentInstance instance = Akonadi::AgentManager::self()->instance(collection.resource());
             if (instance.status() == Akonadi::AgentInstance::Broken) {
-                return KRecursiveFilterProxyModel::flags(sourceIndex) & ~(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+                return QSortFilterProxyModel::flags(sourceIndex) & ~(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
             }
         }
         return Akonadi::EntityRightsFilterModel::flags(index);
@@ -190,7 +190,7 @@ bool FolderTreeWidgetProxyModel::hideOutboxFolder() const
     return d->hideOutboxFolder;
 }
 
-bool FolderTreeWidgetProxyModel::acceptRow(int sourceRow, const QModelIndex &sourceParent) const
+bool FolderTreeWidgetProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
 {
     const QModelIndex modelIndex = sourceModel()->index(sourceRow, 0, sourceParent);
 
@@ -221,7 +221,7 @@ bool FolderTreeWidgetProxyModel::acceptRow(int sourceRow, const QModelIndex &sou
         }
     }
 
-    return KRecursiveFilterProxyModel::acceptRow(sourceRow, sourceParent);
+    return EntityRightsFilterModel::filterAcceptsRow(sourceRow, sourceParent);
 }
 
 QVariant FolderTreeWidgetProxyModel::data(const QModelIndex &index, int role) const
diff --git a/src/folder/foldertreewidgetproxymodel.h b/src/folder/foldertreewidgetproxymodel.h
index 2897861..8a105fb 100644
--- a/src/folder/foldertreewidgetproxymodel.h
+++ b/src/folder/foldertreewidgetproxymodel.h
@@ -20,9 +20,10 @@
 #ifndef MAILCOMMON_FOLDERTREEWIDGETPROXYMODEL_H
 #define MAILCOMMON_FOLDERTREEWIDGETPROXYMODEL_H
 
+#include "mailcommon_export.h"
+
 #include <Collection>
 #include <EntityRightsFilterModel>
-#include "mailcommon_export.h"
 
 namespace MailCommon {
 /**
@@ -69,8 +70,9 @@ public:
     void readConfig();
 
     void setWarningThreshold(qreal threshold);
+
 protected:
-    bool acceptRow(int sourceRow, const QModelIndex &sourceParent) const override;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
 
 private:
     class Private;