1 files changed, 3 insertions, 4 deletions

diff --git a/framework/domain/actions/sinkactions.cpp b/framework/domain/actions/sinkactions.cpp
index e8f1824b..354a5aca 100644
--- a/framework/domain/actions/sinkactions.cpp
+++ b/framework/domain/actions/sinkactions.cpp
@@ -85,8 +85,8 @@ static ActionHandlerHelper sendMailHandler("org.kde.kube.actions.sendmail",
         qWarning() << "Sending a mail: ";
 
         Sink::Query query;
-        query += Sink::Query::PropertyFilter("type", "org.kde.mailtransport");
-        query += Sink::Query::PropertyFilter("account", QVariant::fromValue(accountId));
+        query += Sink::Query::CapabilityFilter("transport");
+        query += Sink::Query::AccountFilter(accountId);
         Sink::Store::fetchAll<Sink::ApplicationDomain::SinkResource>(query)
             .then<void, QList<Sink::ApplicationDomain::SinkResource::Ptr>>([=](const QList<Sink::ApplicationDomain::SinkResource::Ptr> &resources) {
                 if (!resources.isEmpty()) {
@@ -120,8 +120,7 @@ static ActionHandlerHelper saveAsDraft("org.kde.kube.actions.save-as-draft",
 
         if (existingMail.identifier().isEmpty()) {
             Sink::Query query;
-            //TODO replace with capability filter
-            query += Sink::Query::PropertyFilter("type", "org.kde.maildir");
+            query += Sink::Query::CapabilityFilter("drafts");
             query += Sink::Query::AccountFilter(accountId);
             return Sink::Store::fetchOne<Sink::ApplicationDomain::SinkResource>(query)
                 .then<void, KAsync::Job<void>, Sink::ApplicationDomain::SinkResource>([=](const Sink::ApplicationDomain::SinkResource &resource) -> KAsync::Job<void> {