2 files changed, 13 insertions, 0 deletions

diff --git a/framework/domain/maillistmodel.cpp b/framework/domain/maillistmodel.cpp
index 278dca22..3a507e05 100644
--- a/framework/domain/maillistmodel.cpp
+++ b/framework/domain/maillistmodel.cpp
@@ -158,6 +158,18 @@ bool MailListModel::lessThan(const QModelIndex &left, const QModelIndex &right)
     return leftDate < rightDate;
 }
 
+bool MailListModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
+{
+    auto idx = sourceModel()->index(sourceRow, 0, sourceParent);
+    auto regExp = filterRegExp();
+    if (regExp.isEmpty()) {
+        return true;
+    }
+    auto mail = idx.data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Mail::Ptr>();
+    return mail->getSubject().contains(regExp) ||
+        mail->getSender().name.contains(regExp);
+}
+
 void MailListModel::runQuery(const Sink::Query &query)
 {
     m_model = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
diff --git a/framework/domain/maillistmodel.h b/framework/domain/maillistmodel.h
index 8e22da60..44347661 100644
--- a/framework/domain/maillistmodel.h
+++ b/framework/domain/maillistmodel.h
@@ -47,6 +47,7 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
 
     bool lessThan(const QModelIndex &left, const QModelIndex &right) const Q_DECL_OVERRIDE;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_OVERRIDE;
 
     enum Roles {
         Subject  = Qt::UserRole + 1,