diff --git a/src/core/models/entityorderproxymodel.h b/src/core/models/entityorderproxymodel.h
--- a/src/core/models/entityorderproxymodel.h
+++ b/src/core/models/entityorderproxymodel.h
@@ -22,7 +22,7 @@
 #ifndef AKONADI_ENTITYORDERPROXYMODEL_H
 #define AKONADI_ENTITYORDERPROXYMODEL_H
 
-#include <QSortFilterProxyModel>
+#include <KRecursiveFilterProxyModel>
 
 #include "akonadicore_export.h"
 
@@ -41,7 +41,7 @@
  * @author Stephen Kelly <stephen@kdab.com>
  * @since 4.6
  */
-class AKONADICORE_EXPORT EntityOrderProxyModel : public QSortFilterProxyModel
+class AKONADICORE_EXPORT EntityOrderProxyModel : public KRecursiveFilterProxyModel
 {
     Q_OBJECT
 
diff --git a/src/core/models/entityorderproxymodel.cpp b/src/core/models/entityorderproxymodel.cpp
--- a/src/core/models/entityorderproxymodel.cpp
+++ b/src/core/models/entityorderproxymodel.cpp
@@ -56,7 +56,7 @@
 using namespace Akonadi;
 
 EntityOrderProxyModel::EntityOrderProxyModel(QObject *parent)
-    : QSortFilterProxyModel(parent)
+    : KRecursiveFilterProxyModel(parent)
     , d_ptr(new EntityOrderProxyModelPrivate(this))
 {
     setDynamicSortFilter(true);
@@ -81,14 +81,14 @@
     Q_D(const EntityOrderProxyModel);
 
     if (!d->m_orderConfig.isValid()) {
-        return QSortFilterProxyModel::lessThan(left, right);
+        return KRecursiveFilterProxyModel::lessThan(left, right);
     }
     Collection col = left.data(EntityTreeModel::ParentCollectionRole).value<Collection>();
 
     const QStringList list = d->m_orderConfig.readEntry(QString::number(col.id()), QStringList());
 
     if (list.isEmpty()) {
-        return QSortFilterProxyModel::lessThan(left, right);
+        return KRecursiveFilterProxyModel::lessThan(left, right);
     }
 
     const QString leftValue = configString(left);
@@ -98,7 +98,7 @@
     const int rightPosition = list.indexOf(rightValue);
 
     if (leftPosition < 0 || rightPosition < 0) {
-        return QSortFilterProxyModel::lessThan(left, right);
+        return KRecursiveFilterProxyModel::lessThan(left, right);
     }
 
     return leftPosition < rightPosition;
@@ -109,15 +109,15 @@
     Q_D(EntityOrderProxyModel);
 
     if (!d->m_orderConfig.isValid()) {
-        return QSortFilterProxyModel::dropMimeData(data, action, row, column, parent);
+        return KRecursiveFilterProxyModel::dropMimeData(data, action, row, column, parent);
     }
 
     if (!data->hasFormat(QStringLiteral("text/uri-list"))) {
-        return QSortFilterProxyModel::dropMimeData(data, action, row, column, parent);
+        return KRecursiveFilterProxyModel::dropMimeData(data, action, row, column, parent);
     }
 
     if (row == -1) {
-        return QSortFilterProxyModel::dropMimeData(data, action, row, column, parent);
+        return KRecursiveFilterProxyModel::dropMimeData(data, action, row, column, parent);
     }
 
     bool containsMove = false;
@@ -130,7 +130,7 @@
         parentCol = parent.data(EntityTreeModel::CollectionRole).value<Collection>();
     } else {
         if (!hasChildren(parent)) {
-            return QSortFilterProxyModel::dropMimeData(data, action, row, column, parent);
+            return KRecursiveFilterProxyModel::dropMimeData(data, action, row, column, parent);
         }
 
         const QModelIndex targetIndex = index(0, column, parent);
@@ -195,7 +195,7 @@
     d->m_orderConfig.writeEntry(QString::number(parentCol.id()), existingList);
 
     if (containsMove) {
-        bool result = QSortFilterProxyModel::dropMimeData(data, action, row, column, parent);
+        bool result = KRecursiveFilterProxyModel::dropMimeData(data, action, row, column, parent);
         invalidate();
         return result;
     }
@@ -206,7 +206,7 @@
 QModelIndexList EntityOrderProxyModel::match(const QModelIndex &start, int role, const QVariant &value, int hits, Qt::MatchFlags flags) const
 {
     if (role < Qt::UserRole) {
-        return QSortFilterProxyModel::match(start, role, value, hits, flags);
+        return KRecursiveFilterProxyModel::match(start, role, value, hits, flags);
     }
 
     QModelIndexList list;