diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdbf6e8..f913022 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,7 +76,6 @@ set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libx
 remove_definitions( -DQT_NO_CAST_FROM_BYTEARRAY )
 remove_definitions( -DQT_NO_CAST_FROM_ASCII )
 remove_definitions( -DQT_NO_CAST_TO_ASCII )
-remove_definitions("-DQT_NO_URL_CAST_FROM_STRING")
 ########### CMake Config Files ###########
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MailCommon")
 
diff --git a/src/filter/filteractions/filteractionaddtag.cpp b/src/filter/filteractions/filteractionaddtag.cpp
index 89f1390..d5a7890 100644
--- a/src/filter/filteractions/filteractionaddtag.cpp
+++ b/src/filter/filteractions/filteractionaddtag.cpp
@@ -106,7 +106,7 @@ bool FilterActionAddTag::argsFromStringInteractive(const QString &argsStr, const
     if (mList.isEmpty()) {
         return needUpdate;
     }
-    const bool index = mList.contains(mParameter);
+    const bool index = mList.contains(QUrl(mParameter));
     if (!index) {
         QPointer<FilterActionMissingTagDialog> dlg = new FilterActionMissingTagDialog(mList, filterName, argsStr);
         if (dlg->exec()) {
@@ -120,10 +120,10 @@ bool FilterActionAddTag::argsFromStringInteractive(const QString &argsStr, const
 
 FilterAction::ReturnCode FilterActionAddTag::process(ItemContext &context, bool) const
 {
-    if (!mList.contains(mParameter)) {
+    if (!mList.contains(QUrl(mParameter))) {
         return ErrorButGoOn;
     }
-    context.item().setTag(Akonadi::Tag::fromUrl(mParameter));
+    context.item().setTag(Akonadi::Tag::fromUrl(QUrl(mParameter)));
     context.setNeedsFlagStore();
 
     return GoOn;
@@ -140,7 +140,7 @@ void FilterActionAddTag::argsFromString(const QString &argsStr)
         mParameter = argsStr;
         return;
     }
-    if (mList.contains(argsStr)) {
+    if (mList.contains(QUrl(argsStr))) {
         mParameter = argsStr;
         return;
     }
diff --git a/src/filter/filterimporterexporter.cpp b/src/filter/filterimporterexporter.cpp
index 4cd329d..aa97f90 100644
--- a/src/filter/filterimporterexporter.cpp
+++ b/src/filter/filterimporterexporter.cpp
@@ -348,7 +348,7 @@ void FilterImporterExporter::exportFilters(const QList<MailFilter *> &filters, c
 {
     QUrl saveUrl;
     if (fileName.isEmpty()) {
-        saveUrl = QFileDialog::getSaveFileUrl(d->mParent, i18n("Export Filters"), QDir::homePath());
+        saveUrl = QFileDialog::getSaveFileUrl(d->mParent, i18n("Export Filters"), QUrl::fromLocalFile(QDir::homePath()));
 
         if (saveUrl.isEmpty() ||
                 !MessageViewer::Util::checkOverwrite(saveUrl, d->mParent)) {