diff --git a/src/filter/dialog/filteractionmissingaccountdialog.cpp b/src/filter/dialog/filteractionmissingaccountdialog.cpp
index 5969908..918895d 100644
--- a/src/filter/dialog/filteractionmissingaccountdialog.cpp
+++ b/src/filter/dialog/filteractionmissingaccountdialog.cpp
@@ -20,11 +20,12 @@
 
 #include "filteractionmissingaccountdialog.h"
 #include "filter/kmfilteraccountlist.h"
-#include "kernel/mailkernel.h"
 #include "util/mailutil.h"
 
 #include <KLocalizedString>
+#include <KSharedConfig>
 
+#include <KConfigGroup>
 #include <QDialogButtonBox>
 #include <QHBoxLayout>
 #include <QLabel>
@@ -71,7 +72,7 @@ FilterActionMissingAccountDialog::~FilterActionMissingAccountDialog()
 
 void FilterActionMissingAccountDialog::readConfig()
 {
-    KConfigGroup group(KernelIf->config(), "FilterActionMissingAccountDialog");
+    KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingAccountDialog");
 
     const QSize size = group.readEntry("Size", QSize(500, 300));
     if (size.isValid()) {
@@ -81,7 +82,7 @@ void FilterActionMissingAccountDialog::readConfig()
 
 void FilterActionMissingAccountDialog::writeConfig()
 {
-    KConfigGroup group(KernelIf->config(), "FilterActionMissingAccountDialog");
+    KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingAccountDialog");
     group.writeEntry("Size", size());
 }
 
diff --git a/src/filter/dialog/filteractionmissingidentitydialog.cpp b/src/filter/dialog/filteractionmissingidentitydialog.cpp
index d3abd7f..678cc6a 100644
--- a/src/filter/dialog/filteractionmissingidentitydialog.cpp
+++ b/src/filter/dialog/filteractionmissingidentitydialog.cpp
@@ -21,7 +21,7 @@
 #include "filteractionmissingidentitydialog.h"
 #include "kernel/mailkernel.h"
 
-
+#include <KSharedConfig>
 #include <KConfigGroup>
 #include <KLocalizedString>
 
@@ -72,7 +72,7 @@ FilterActionMissingIdentityDialog::~FilterActionMissingIdentityDialog()
 
 void FilterActionMissingIdentityDialog::readConfig()
 {
-    KConfigGroup group(KernelIf->config(), "FilterActionMissingMissingIdentity");
+    KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingMissingIdentity");
 
     const QSize size = group.readEntry("Size", QSize(500, 300));
     if (size.isValid()) {
@@ -82,7 +82,7 @@ void FilterActionMissingIdentityDialog::readConfig()
 
 void FilterActionMissingIdentityDialog::writeConfig()
 {
-    KConfigGroup group(KernelIf->config(), "FilterActionMissingMissingIdentity");
+    KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingMissingIdentity");
     group.writeEntry("Size", size());
 }
 
diff --git a/src/filter/dialog/filteractionmissingsoundurldialog.cpp b/src/filter/dialog/filteractionmissingsoundurldialog.cpp
index 29f264e..62c7ccc 100644
--- a/src/filter/dialog/filteractionmissingsoundurldialog.cpp
+++ b/src/filter/dialog/filteractionmissingsoundurldialog.cpp
@@ -18,11 +18,11 @@
 */
 
 #include "filteractionmissingsoundurldialog.h"
-#include "kernel/mailkernel.h"
 
 #include <KConfigGroup>
 #include <KLocalizedString>
 #include <KUrlRequester>
+#include <KSharedConfig>
 #include <QDialogButtonBox>
 #include <QLabel>
 #include <QPushButton>
@@ -78,7 +78,7 @@ QString FilterActionMissingSoundUrlDialog::soundUrl() const
 
 void FilterActionMissingSoundUrlDialog::readConfig()
 {
-    KConfigGroup group(KernelIf->config(), "FilterActionMissingSoundUrlDialog");
+    KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingSoundUrlDialog");
 
     const QSize size = group.readEntry("Size", QSize(500, 300));
     if (size.isValid()) {
@@ -88,7 +88,7 @@ void FilterActionMissingSoundUrlDialog::readConfig()
 
 void FilterActionMissingSoundUrlDialog::writeConfig()
 {
-    KConfigGroup group(KernelIf->config(), "FilterActionMissingSoundUrlDialog");
+    KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingSoundUrlDialog");
     group.writeEntry("Size", size());
 }
 
diff --git a/src/filter/dialog/filteractionmissingtagdialog.cpp b/src/filter/dialog/filteractionmissingtagdialog.cpp
index ff8ea03..9f7f25a 100644
--- a/src/filter/dialog/filteractionmissingtagdialog.cpp
+++ b/src/filter/dialog/filteractionmissingtagdialog.cpp
@@ -20,9 +20,9 @@
 
 #include "filteractionmissingtagdialog.h"
 #include <KLocalizedString>
+#include <KSharedConfig>
 
 #include "tag/addtagdialog.h"
-#include "kernel/mailkernel.h"
 
 #include <KConfigGroup>
 #include <QDialogButtonBox>
@@ -89,7 +89,7 @@ FilterActionMissingTagDialog::~FilterActionMissingTagDialog()
 
 void FilterActionMissingTagDialog::readConfig()
 {
-    KConfigGroup group(KernelIf->config(), "FilterActionMissingTagDialog");
+    KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTagDialog");
 
     const QSize size = group.readEntry("Size", QSize(500, 300));
     if (size.isValid()) {
@@ -99,7 +99,7 @@ void FilterActionMissingTagDialog::readConfig()
 
 void FilterActionMissingTagDialog::writeConfig()
 {
-    KConfigGroup group(KernelIf->config(), "FilterActionMissingTagDialog");
+    KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTagDialog");
     group.writeEntry("Size", size());
 }
 
diff --git a/src/filter/dialog/filteractionmissingtemplatedialog.cpp b/src/filter/dialog/filteractionmissingtemplatedialog.cpp
index e52602e..2338c5f 100644
--- a/src/filter/dialog/filteractionmissingtemplatedialog.cpp
+++ b/src/filter/dialog/filteractionmissingtemplatedialog.cpp
@@ -18,7 +18,8 @@
 */
 
 #include "filteractionmissingtemplatedialog.h"
-#include "kernel/mailkernel.h"
+
+#include <KSharedConfig>
 
 #include <KComboBox>
 #include <KConfigGroup>
@@ -69,7 +70,7 @@ FilterActionMissingTemplateDialog::~FilterActionMissingTemplateDialog()
 
 void FilterActionMissingTemplateDialog::readConfig()
 {
-    KConfigGroup group(KernelIf->config(), "FilterActionMissingTemplateDialog");
+    KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTemplateDialog");
 
     const QSize size = group.readEntry("Size", QSize(500, 300));
     if (size.isValid()) {
@@ -79,7 +80,7 @@ void FilterActionMissingTemplateDialog::readConfig()
 
 void FilterActionMissingTemplateDialog::writeConfig()
 {
-    KConfigGroup group(KernelIf->config(), "FilterActionMissingTemplateDialog");
+    KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTemplateDialog");
     group.writeEntry("Size", size());
 }
 
diff --git a/src/filter/dialog/filteractionmissingtransportdialog.cpp b/src/filter/dialog/filteractionmissingtransportdialog.cpp
index 7b09fdd..9bc1daa 100644
--- a/src/filter/dialog/filteractionmissingtransportdialog.cpp
+++ b/src/filter/dialog/filteractionmissingtransportdialog.cpp
@@ -18,8 +18,8 @@
 */
 
 #include "filteractionmissingtransportdialog.h"
-#include "kernel/mailkernel.h"
 
+#include <KSharedConfig>
 #include <KLocalizedString>
 
 #include <QDialogButtonBox>
@@ -68,7 +68,7 @@ FilterActionMissingTransportDialog::~FilterActionMissingTransportDialog()
 
 void FilterActionMissingTransportDialog::readConfig()
 {
-    KConfigGroup group(KernelIf->config(), "FilterActionMissingTransportDialog");
+    KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTransportDialog");
 
     const QSize size = group.readEntry("Size", QSize(500, 300));
     if (size.isValid()) {
@@ -78,7 +78,7 @@ void FilterActionMissingTransportDialog::readConfig()
 
 void FilterActionMissingTransportDialog::writeConfig()
 {
-    KConfigGroup group(KernelIf->config(), "FilterActionMissingTransportDialog");
+    KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTransportDialog");
     group.writeEntry("Size", size());
 }
 
diff --git a/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp b/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp
index e3d6703..658e7e0 100644
--- a/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp
+++ b/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp
@@ -17,7 +17,7 @@
 
 #include "selectthunderbirdfilterfilesdialog.h"
 #include "selectthunderbirdfilterfileswidget.h"
-#include "kernel/mailkernel.h"
+#include <KSharedConfig>
 #include <KLocalizedString>
 
 #include <QHBoxLayout>
@@ -67,7 +67,7 @@ void SelectThunderbirdFilterFilesDialog::setStartDir(const QUrl &url)
 
 void SelectThunderbirdFilterFilesDialog::readConfig()
 {
-    KConfigGroup group(KernelIf->config(), "SelectThunderbirdFilterFilesDialog");
+    KConfigGroup group(KSharedConfig::openConfig(), "SelectThunderbirdFilterFilesDialog");
 
     const QSize size = group.readEntry("Size", QSize(500, 300));
     if (size.isValid()) {
@@ -77,6 +77,6 @@ void SelectThunderbirdFilterFilesDialog::readConfig()
 
 void SelectThunderbirdFilterFilesDialog::writeConfig()
 {
-    KConfigGroup group(KernelIf->config(), "SelectThunderbirdFilterFilesDialog");
+    KConfigGroup group(KSharedConfig::openConfig(), "SelectThunderbirdFilterFilesDialog");
     group.writeEntry("Size", size());
 }