diff --git a/src/filter/autotests/filteractionaddheadertest.cpp b/src/filter/autotests/filteractionaddheadertest.cpp
--- a/src/filter/autotests/filteractionaddheadertest.cpp
+++ b/src/filter/autotests/filteractionaddheadertest.cpp
@@ -22,7 +22,7 @@
 #include <KLineEdit>
 #include <QLabel>
 #include <QTest>
-#include <pimcommon/minimumcombobox.h>
+#include <QComboBox>
 
 FilterActionAddHeaderTest::FilterActionAddHeaderTest(QObject *parent)
     : QObject(parent)
@@ -38,7 +38,7 @@
     MailCommon::FilterActionAddHeader filter;
     QWidget *widget = filter.createParamWidget(nullptr);
     QVERIFY(widget);
-    PimCommon::MinimumComboBox *comboBox = widget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("combo"));
+    auto comboBox = widget->findChild<QComboBox *>(QStringLiteral("combo"));
     QVERIFY(comboBox);
     QVERIFY(comboBox->isEditable());
     QLabel *label = widget->findChild<QLabel *>(QStringLiteral("label_value"));
@@ -62,7 +62,7 @@
 {
     MailCommon::FilterActionAddHeader filter;
     QWidget *widget = filter.createParamWidget(nullptr);
-    PimCommon::MinimumComboBox *comboBox = widget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("combo"));
+    auto comboBox = widget->findChild<QComboBox *>(QStringLiteral("combo"));
     KLineEdit *lineEdit = widget->findChild<KLineEdit *>(QStringLiteral("ledit"));
     comboBox->lineEdit()->setText(QStringLiteral("test"));
     lineEdit->setText(QStringLiteral("blo"));
@@ -198,7 +198,7 @@
     QWidget *widget = filter.createParamWidget(nullptr);
     filter.argsFromString(argsinput);
     filter.setParamWidgetValue(widget);
-    PimCommon::MinimumComboBox *comboBox = widget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("combo"));
+    auto comboBox = widget->findChild<QComboBox *>(QStringLiteral("combo"));
     KLineEdit *lineEdit = widget->findChild<KLineEdit *>(QStringLiteral("ledit"));
     QCOMPARE(comboBox->lineEdit()->text(), resultheader);
     QCOMPARE(lineEdit->text(), resultvalue);
diff --git a/src/filter/autotests/filteractionaddtoaddressbooktest.cpp b/src/filter/autotests/filteractionaddtoaddressbooktest.cpp
--- a/src/filter/autotests/filteractionaddtoaddressbooktest.cpp
+++ b/src/filter/autotests/filteractionaddtoaddressbooktest.cpp
@@ -21,7 +21,7 @@
 #include <QWidget>
 #include <QLabel>
 #include <klineedit.h>
-#include <pimcommon/minimumcombobox.h>
+#include <QComboBox>
 #include <libkdepimakonadi/tagwidgets.h>
 #include <AkonadiWidgets/CollectionComboBox>
 
@@ -39,7 +39,7 @@
     MailCommon::FilterActionAddToAddressBook filter;
     QWidget *w = filter.createParamWidget(nullptr);
 
-    PimCommon::MinimumComboBox *headerCombo = w->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("HeaderComboBox"));
+    auto headerCombo = w->findChild<QComboBox *>(QStringLiteral("HeaderComboBox"));
     QVERIFY(headerCombo);
 
     QLabel *label = w->findChild<QLabel *>(QStringLiteral("label_with_category"));
diff --git a/src/filter/autotests/filteractionremoveheadertest.cpp b/src/filter/autotests/filteractionremoveheadertest.cpp
--- a/src/filter/autotests/filteractionremoveheadertest.cpp
+++ b/src/filter/autotests/filteractionremoveheadertest.cpp
@@ -18,7 +18,7 @@
 #include "filteractionremoveheadertest.h"
 #include "../filteractions/filteractionremoveheader.h"
 #include <QTest>
-#include <pimcommon/minimumcombobox.h>
+#include <QComboBox>
 
 FilterActionRemoveHeaderTest::FilterActionRemoveHeaderTest(QObject *parent)
     : QObject(parent)
@@ -33,7 +33,7 @@
 {
     MailCommon::FilterActionRemoveHeader filter;
     QWidget *w = filter.createParamWidget(nullptr);
-    PimCommon::MinimumComboBox *comboBox = dynamic_cast<PimCommon::MinimumComboBox *>(w);
+    const auto comboBox = dynamic_cast<QComboBox *>(w);
     QVERIFY(comboBox);
     QVERIFY(comboBox->isEditable());
     QVERIFY(comboBox->count() > 0);
diff --git a/src/filter/autotests/filteractionrewriteheadertest.cpp b/src/filter/autotests/filteractionrewriteheadertest.cpp
--- a/src/filter/autotests/filteractionrewriteheadertest.cpp
+++ b/src/filter/autotests/filteractionrewriteheadertest.cpp
@@ -21,7 +21,8 @@
 #include <KLineEdit>
 #include <QLabel>
 #include <QWidget>
-#include <pimcommon/minimumcombobox.h>
+#include <QComboBox>
+
 FilterActionRewriteHeaderTest::FilterActionRewriteHeaderTest(QObject *parent)
     : QObject(parent)
 {
@@ -35,7 +36,7 @@
 {
     MailCommon::FilterActionRewriteHeader filter;
     QWidget *w = filter.createParamWidget(nullptr);
-    PimCommon::MinimumComboBox *combo = w->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("combo"));
+    auto combo = w->findChild<QComboBox *>(QStringLiteral("combo"));
     QVERIFY(combo);
     QVERIFY(combo->count() > 0);
 
diff --git a/src/filter/autotests/filteractionsendfakedispositiontest.cpp b/src/filter/autotests/filteractionsendfakedispositiontest.cpp
--- a/src/filter/autotests/filteractionsendfakedispositiontest.cpp
+++ b/src/filter/autotests/filteractionsendfakedispositiontest.cpp
@@ -18,7 +18,7 @@
 #include "filteractionsendfakedispositiontest.h"
 #include "../filteractions/filteractionsendfakedisposition.h"
 #include <QTest>
-#include <pimcommon/minimumcombobox.h>
+#include <QComboBox>
 
 FilterActionSendFakeDispositionTest::FilterActionSendFakeDispositionTest(QObject *parent)
     : QObject(parent)
@@ -35,7 +35,7 @@
     QWidget *w = filter.createParamWidget(nullptr);
     QCOMPARE(w->objectName(), QStringLiteral("combobox"));
 
-    PimCommon::MinimumComboBox *comboBox = dynamic_cast<PimCommon::MinimumComboBox *>(w);
+    auto comboBox = dynamic_cast<QComboBox *>(w);
     QVERIFY(comboBox);
     QVERIFY(!comboBox->isEditable());
     QVERIFY(comboBox->count() > 0);
diff --git a/src/filter/autotests/filteractionsetstatustest.cpp b/src/filter/autotests/filteractionsetstatustest.cpp
--- a/src/filter/autotests/filteractionsetstatustest.cpp
+++ b/src/filter/autotests/filteractionsetstatustest.cpp
@@ -19,7 +19,7 @@
 #include "../filteractions/filteractionsetstatus.h"
 #include <QTest>
 #include <QWidget>
-#include <pimcommon/minimumcombobox.h>
+#include <QComboBox>
 
 FilterActionSetStatusTest::FilterActionSetStatusTest(QObject *parent)
     : QObject(parent)
@@ -35,7 +35,7 @@
     MailCommon::FilterActionSetStatus filter;
     QWidget *w = filter.createParamWidget(nullptr);
     QCOMPARE(w->objectName(), QStringLiteral("combobox"));
-    PimCommon::MinimumComboBox *comboBox = dynamic_cast<PimCommon::MinimumComboBox *>(w);
+    auto comboBox = dynamic_cast<QComboBox *>(w);
     QVERIFY(comboBox);
     QVERIFY(!comboBox->isEditable());
     QVERIFY(comboBox->count() > 0);
diff --git a/src/filter/filteractions/filteractionaddheader.cpp b/src/filter/filteractions/filteractionaddheader.cpp
--- a/src/filter/filteractions/filteractionaddheader.cpp
+++ b/src/filter/filteractions/filteractionaddheader.cpp
@@ -19,10 +19,9 @@
 
 #include "filteractionaddheader.h"
 
-#include <PimCommon/MinimumComboBox>
-
 #include <KLineEdit>
 #include <KLocalizedString>
+#include <KComboBox>
 
 #include <QComboBox>
 #include <QHBoxLayout>
@@ -77,7 +76,8 @@
     layout->setSpacing(4);
     layout->setContentsMargins(0, 0, 0, 0);
 
-    PimCommon::MinimumComboBox *comboBox = new PimCommon::MinimumComboBox(widget);
+    KComboBox *comboBox = new KComboBox(widget);
+    comboBox->setMinimumWidth(50);
     comboBox->setObjectName(QStringLiteral("combo"));
     comboBox->setEditable(true);
     comboBox->setInsertPolicy(QComboBox::InsertAtBottom);
@@ -102,7 +102,7 @@
 
     setParamWidgetValue(widget);
 
-    connect(comboBox, QOverload<int>::of(&PimCommon::MinimumComboBox::currentIndexChanged), this, &FilterActionAddHeader::filterActionModified);
+    connect(comboBox, QOverload<int>::of(&KComboBox::currentIndexChanged), this, &FilterActionAddHeader::filterActionModified);
     connect(comboBox->lineEdit(), &QLineEdit::textChanged,
             this, &FilterAction::filterActionModified);
     connect(lineEdit, &QLineEdit::textChanged, this, &FilterActionAddHeader::filterActionModified);
@@ -114,7 +114,7 @@
 {
     const int index = mParameterList.indexOf(mParameter);
 
-    PimCommon::MinimumComboBox *comboBox = paramWidget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("combo"));
+    const auto comboBox = paramWidget->findChild<KComboBox *>(QStringLiteral("combo"));
     Q_ASSERT(comboBox);
     comboBox->clear();
     comboBox->addItems(mParameterList);
@@ -134,7 +134,7 @@
 
 void FilterActionAddHeader::applyParamWidgetValue(QWidget *paramWidget)
 {
-    const PimCommon::MinimumComboBox *comboBox = paramWidget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("combo"));
+    const auto comboBox = paramWidget->findChild<KComboBox *>(QStringLiteral("combo"));
     Q_ASSERT(comboBox);
     mParameter = comboBox->currentText();
 
@@ -145,7 +145,7 @@
 
 void FilterActionAddHeader::clearParamWidget(QWidget *paramWidget) const
 {
-    PimCommon::MinimumComboBox *comboBox = paramWidget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("combo"));
+    const auto comboBox = paramWidget->findChild<KComboBox *>(QStringLiteral("combo"));
     Q_ASSERT(comboBox);
     comboBox->setCurrentIndex(0);
 
diff --git a/src/filter/filteractions/filteractionaddtag.h b/src/filter/filteractions/filteractionaddtag.h
--- a/src/filter/filteractions/filteractionaddtag.h
+++ b/src/filter/filteractions/filteractionaddtag.h
@@ -22,9 +22,9 @@
 
 #include "filteractionwithstringlist.h"
 
-namespace PimCommon {
-class MinimumComboBox;
-}
+#include <QPointer>
+
+class QComboBox;
 
 namespace MailCommon {
 //=============================================================================
@@ -62,7 +62,7 @@
     void initializeTagList();
     mutable QMap<QUrl, QString> mList;
     QString mParameter;
-    mutable PimCommon::MinimumComboBox *mComboBox = nullptr;
+    mutable QPointer<QComboBox> mComboBox;
 };
 }
 
diff --git a/src/filter/filteractions/filteractionaddtag.cpp b/src/filter/filteractions/filteractionaddtag.cpp
--- a/src/filter/filteractions/filteractionaddtag.cpp
+++ b/src/filter/filteractions/filteractionaddtag.cpp
@@ -20,10 +20,11 @@
 #include "filteractionaddtag.h"
 #include "filter/filtermanager.h"
 #include "filter/dialog/filteractionmissingtagdialog.h"
-#include "PimCommon/MinimumComboBox"
 
 #include <QPointer>
-#include <Tag>
+#include <QComboBox>
+
+#include <AkonadiCore/Tag>
 
 using namespace MailCommon;
 
@@ -34,15 +35,15 @@
 
 FilterActionAddTag::FilterActionAddTag(QObject *parent)
     : FilterAction(QStringLiteral("add tag"), i18n("Add Tag"), parent)
-    , mComboBox(nullptr)
 {
     mList = FilterManager::instance()->tagList();
     connect(FilterManager::instance(), &FilterManager::tagListingFinished, this, &FilterActionAddTag::slotTagListingFinished);
 }
 
 QWidget *FilterActionAddTag::createParamWidget(QWidget *parent) const
 {
-    mComboBox = new PimCommon::MinimumComboBox(parent);
+    mComboBox = new QComboBox(parent);
+    mComboBox->setMinimumWidth(50);
     mComboBox->setEditable(false);
     QMapIterator<QUrl, QString> i(mList);
     while (i.hasNext()) {
@@ -52,27 +53,27 @@
 
     setParamWidgetValue(mComboBox);
 
-    connect(mComboBox, QOverload<int>::of(&PimCommon::MinimumComboBox::currentIndexChanged), this, &FilterActionAddTag::filterActionModified);
+    connect(mComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &FilterActionAddTag::filterActionModified);
 
     return mComboBox;
 }
 
 void FilterActionAddTag::applyParamWidgetValue(QWidget *paramWidget)
 {
-    PimCommon::MinimumComboBox *combo = static_cast<PimCommon::MinimumComboBox *>(paramWidget);
+    auto combo = static_cast<QComboBox*>(paramWidget);
     mParameter = combo->itemData(combo->currentIndex()).toString();
 }
 
 void FilterActionAddTag::setParamWidgetValue(QWidget *paramWidget) const
 {
-    const int index = static_cast<PimCommon::MinimumComboBox *>(paramWidget)->findData(mParameter);
+    const int index = static_cast<QComboBox*>(paramWidget)->findData(mParameter);
 
-    static_cast<PimCommon::MinimumComboBox *>(paramWidget)->setCurrentIndex(index < 0 ? 0 : index);
+    static_cast<QComboBox*>(paramWidget)->setCurrentIndex(index < 0 ? 0 : index);
 }
 
 void FilterActionAddTag::clearParamWidget(QWidget *paramWidget) const
 {
-    static_cast<PimCommon::MinimumComboBox *>(paramWidget)->setCurrentIndex(0);
+    static_cast<QComboBox*>(paramWidget)->setCurrentIndex(0);
 }
 
 bool FilterActionAddTag::isEmpty() const
diff --git a/src/filter/filteractions/filteractionaddtoaddressbook.cpp b/src/filter/filteractions/filteractionaddtoaddressbook.cpp
--- a/src/filter/filteractions/filteractionaddtoaddressbook.cpp
+++ b/src/filter/filteractions/filteractionaddtoaddressbook.cpp
@@ -19,15 +19,14 @@
 
 #include "filteractionaddtoaddressbook.h"
 
-#include "PimCommon/MinimumComboBox"
-
 #include <LibkdepimAkonadi/AddContactJob>
 #include <LibkdepimAkonadi/TagWidgets>
 
 #include <CollectionComboBox>
 #include <KContacts/Addressee>
 #include <KLocalizedString>
 #include <KEmailAddress>
+#include <KComboBox>
 
 #include <QGridLayout>
 #include <QLabel>
@@ -116,7 +115,8 @@
     QWidget *widget = new QWidget(parent);
     QGridLayout *layout = new QGridLayout(widget);
 
-    PimCommon::MinimumComboBox *headerCombo = new PimCommon::MinimumComboBox(widget);
+    const auto headerCombo = new KComboBox(widget);
+    headerCombo->setMinimumWidth(50);
     headerCombo->setObjectName(QStringLiteral("HeaderComboBox"));
     layout->addWidget(headerCombo, 0, 0, 2, 1, Qt::AlignVCenter);
 
@@ -141,7 +141,7 @@
                                         "If it is not accessible, the filter will fallback to the default address book."));
     layout->addWidget(collectionComboBox, 1, 2);
 
-    connect(headerCombo, QOverload<int>::of(&PimCommon::MinimumComboBox::currentIndexChanged), this, &FilterActionAddToAddressBook::filterActionModified);
+    connect(headerCombo, QOverload<int>::of(&KComboBox::currentIndexChanged), this, &FilterActionAddToAddressBook::filterActionModified);
     connect(collectionComboBox, QOverload<int>::of(&Akonadi::CollectionComboBox::activated), this, &FilterActionAddToAddressBook::filterActionModified);
     connect(categoryEdit, SIGNAL(selectionChanged(QStringList)),
             this, SIGNAL(filterActionModified()));
@@ -153,7 +153,7 @@
 
 void FilterActionAddToAddressBook::setParamWidgetValue(QWidget *paramWidget) const
 {
-    PimCommon::MinimumComboBox *headerCombo = paramWidget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("HeaderComboBox"));
+    const auto headerCombo = paramWidget->findChild<KComboBox *>(QStringLiteral("HeaderComboBox"));
     Q_ASSERT(headerCombo);
     headerCombo->clear();
     headerCombo->addItem(mFromStr, FromHeader);
@@ -175,7 +175,7 @@
 
 void FilterActionAddToAddressBook::applyParamWidgetValue(QWidget *paramWidget)
 {
-    const PimCommon::MinimumComboBox *headerCombo = paramWidget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("HeaderComboBox"));
+    const auto headerCombo = paramWidget->findChild<QComboBox *>(QStringLiteral("HeaderComboBox"));
     Q_ASSERT(headerCombo);
     mHeaderType = static_cast<HeaderType>(headerCombo->itemData(headerCombo->currentIndex()).toInt());
 
@@ -202,7 +202,7 @@
 
 void FilterActionAddToAddressBook::clearParamWidget(QWidget *paramWidget) const
 {
-    PimCommon::MinimumComboBox *headerCombo = paramWidget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("HeaderComboBox"));
+    const auto headerCombo = paramWidget->findChild<QComboBox *>(QStringLiteral("HeaderComboBox"));
     Q_ASSERT(headerCombo);
     headerCombo->setCurrentIndex(0);
 
diff --git a/src/filter/filteractions/filteractionforward.cpp b/src/filter/filteractions/filteractionforward.cpp
--- a/src/filter/filteractions/filteractionforward.cpp
+++ b/src/filter/filteractions/filteractionforward.cpp
@@ -24,7 +24,6 @@
 #include "util/mailutil.h"
 #include "filter/dialog/filteractionmissingtemplatedialog.h"
 
-#include <PimCommon/MinimumComboBox>
 #include <MessageComposer/MessageFactoryNG>
 #include <MessageComposer/MessageSender>
 #include <Akonadi/Contact/EmailAddressRequester>
@@ -34,6 +33,7 @@
 
 #include <KLocalizedString>
 #include <KLineEdit>
+#include <KComboBox>
 
 #include <QHBoxLayout>
 
@@ -105,7 +105,8 @@
     lineEdit->setToolTip(i18n("The addressee to whom the message will be forwarded."));
     lineEdit->setWhatsThis(i18n("The filter will forward the message to the addressee entered here."));
 
-    PimCommon::MinimumComboBox *templateCombo = new PimCommon::MinimumComboBox(addressAndTemplate);
+    auto templateCombo = new KComboBox(addressAndTemplate);
+    templateCombo->setMinimumWidth(50);
     templateCombo->setObjectName(QStringLiteral("templateCombo"));
     layout->addWidget(templateCombo);
 
@@ -124,7 +125,7 @@
     templateCombo->setToolTip(i18n("The template used when forwarding"));
     templateCombo->setWhatsThis(i18n("Set the forwarding template that will be used with this filter."));
 
-    connect(templateCombo, QOverload<int>::of(&PimCommon::MinimumComboBox::currentIndexChanged), this, &FilterActionForward::filterActionModified);
+    connect(templateCombo, QOverload<int>::of(&KComboBox::currentIndexChanged), this, &FilterActionForward::filterActionModified);
     connect(addressRequester, &Akonadi::EmailAddressRequester::textChanged, this, &FilterActionForward::filterActionModified);
 
     return addressAndTemplate;
@@ -136,7 +137,7 @@
     Q_ASSERT(addressEdit);
     FilterActionWithAddress::applyParamWidgetValue(addressEdit);
 
-    const PimCommon::MinimumComboBox *templateCombo = paramWidget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("templateCombo"));
+    const auto templateCombo = paramWidget->findChild<KComboBox *>(QStringLiteral("templateCombo"));
     Q_ASSERT(templateCombo);
 
     if (templateCombo->currentIndex() == 0) {
@@ -153,7 +154,7 @@
     Q_ASSERT(addressEdit);
     FilterActionWithAddress::setParamWidgetValue(addressEdit);
 
-    PimCommon::MinimumComboBox *templateCombo = paramWidget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("templateCombo"));
+    const auto templateCombo = paramWidget->findChild<KComboBox *>(QStringLiteral("templateCombo"));
     Q_ASSERT(templateCombo);
 
     if (mTemplate.isEmpty()) {
@@ -174,7 +175,7 @@
     Q_ASSERT(addressEdit);
     FilterActionWithAddress::clearParamWidget(addressEdit);
 
-    PimCommon::MinimumComboBox *templateCombo = paramWidget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("templateCombo"));
+    const auto templateCombo = paramWidget->findChild<KComboBox *>(QStringLiteral("templateCombo"));
     Q_ASSERT(templateCombo);
 
     templateCombo->setCurrentIndex(0);
diff --git a/src/filter/filteractions/filteractionremoveheader.cpp b/src/filter/filteractions/filteractionremoveheader.cpp
--- a/src/filter/filteractions/filteractionremoveheader.cpp
+++ b/src/filter/filteractions/filteractionremoveheader.cpp
@@ -19,10 +19,9 @@
 
 #include "filteractionremoveheader.h"
 
-#include "PimCommon/MinimumComboBox"
-
 #include <KLocalizedString>
 #include <QLineEdit>
+#include <KComboBox>
 
 using namespace MailCommon;
 
@@ -46,12 +45,13 @@
 
 QWidget *FilterActionRemoveHeader::createParamWidget(QWidget *parent) const
 {
-    PimCommon::MinimumComboBox *comboBox = new PimCommon::MinimumComboBox(parent);
+    auto comboBox = new KComboBox(parent);
     comboBox->setEditable(true);
+    comboBox->setMinimumWidth(50);
     comboBox->setInsertPolicy(QComboBox::InsertAtBottom);
     setParamWidgetValue(comboBox);
 
-    connect(comboBox, QOverload<int>::of(&PimCommon::MinimumComboBox::currentIndexChanged), this, &FilterActionRemoveHeader::filterActionModified);
+    connect(comboBox, QOverload<int>::of(&KComboBox::currentIndexChanged), this, &FilterActionRemoveHeader::filterActionModified);
     connect(comboBox->lineEdit(), &QLineEdit::textChanged,
             this, &FilterAction::filterActionModified);
 
@@ -85,7 +85,7 @@
 
 void FilterActionRemoveHeader::setParamWidgetValue(QWidget *paramWidget) const
 {
-    PimCommon::MinimumComboBox *comboBox = qobject_cast<PimCommon::MinimumComboBox *>(paramWidget);
+    const auto comboBox = qobject_cast<KComboBox *>(paramWidget);
     Q_ASSERT(comboBox);
 
     const int index = mParameterList.indexOf(mParameter);
diff --git a/src/filter/filteractions/filteractionrewriteheader.cpp b/src/filter/filteractions/filteractionrewriteheader.cpp
--- a/src/filter/filteractions/filteractionrewriteheader.cpp
+++ b/src/filter/filteractions/filteractionrewriteheader.cpp
@@ -19,10 +19,9 @@
 
 #include "filteractionrewriteheader.h"
 
-#include <PimCommon/MinimumComboBox>
-
 #include <KLineEdit>
 #include <KLocalizedString>
+#include <KComboBox>
 
 #include <QHBoxLayout>
 #include <QLabel>
@@ -113,7 +112,8 @@
     layout->setSpacing(4);
     layout->setContentsMargins(0, 0, 0, 0);
 
-    PimCommon::MinimumComboBox *comboBox = new PimCommon::MinimumComboBox(widget);
+    auto comboBox = new KComboBox(widget);
+    comboBox->setMinimumWidth(50);
     comboBox->setEditable(true);
     comboBox->setObjectName(QStringLiteral("combo"));
     comboBox->setInsertPolicy(QComboBox::InsertAtBottom);
@@ -148,7 +148,7 @@
 
     setParamWidgetValue(widget);
 
-    connect(comboBox, QOverload<int>::of(&PimCommon::MinimumComboBox::currentIndexChanged), this, &FilterActionRewriteHeader::filterActionModified);
+    connect(comboBox, QOverload<int>::of(&KComboBox::currentIndexChanged), this, &FilterActionRewriteHeader::filterActionModified);
     connect(comboBox->lineEdit(), &QLineEdit::textChanged,
             this, &FilterAction::filterActionModified);
     connect(regExpLineEdit, &KLineEdit::textChanged, this, &FilterActionRewriteHeader::filterActionModified);
@@ -160,7 +160,7 @@
 void FilterActionRewriteHeader::setParamWidgetValue(QWidget *paramWidget) const
 {
     const int index = mParameterList.indexOf(mParameter);
-    PimCommon::MinimumComboBox *comboBox = paramWidget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("combo"));
+    const auto comboBox = paramWidget->findChild<KComboBox *>(QStringLiteral("combo"));
     Q_ASSERT(comboBox);
 
     comboBox->clear();
@@ -183,7 +183,7 @@
 
 void FilterActionRewriteHeader::applyParamWidgetValue(QWidget *paramWidget)
 {
-    const PimCommon::MinimumComboBox *comboBox = paramWidget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("combo"));
+    const auto comboBox = paramWidget->findChild<KComboBox *>(QStringLiteral("combo"));
     Q_ASSERT(comboBox);
     mParameter = comboBox->currentText();
 
@@ -198,7 +198,7 @@
 
 void FilterActionRewriteHeader::clearParamWidget(QWidget *paramWidget) const
 {
-    PimCommon::MinimumComboBox *comboBox = paramWidget->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("combo"));
+    const auto comboBox = paramWidget->findChild<KComboBox *>(QStringLiteral("combo"));
     Q_ASSERT(comboBox);
     comboBox->setCurrentIndex(0);
 
diff --git a/src/filter/filteractions/filteractionwidget.cpp b/src/filter/filteractions/filteractionwidget.cpp
--- a/src/filter/filteractions/filteractionwidget.cpp
+++ b/src/filter/filteractions/filteractionwidget.cpp
@@ -23,11 +23,11 @@
 #include "filter/filteractions/filteractiondict.h"
 #include "filter/filtermanager.h"
 #include "filter/mailfilter.h"
-#include <PimCommon/MinimumComboBox>
 
 #include <KLocalizedString>
 #include <QPushButton>
 #include <QIcon>
+#include <QComboBox>
 
 #include <QGridLayout>
 #include <QLabel>
@@ -66,7 +66,7 @@
 
     FilterActionWidget *q;
     QList<MailCommon::FilterAction *> mActionList;
-    KComboBox *mComboBox = nullptr;
+    QComboBox *mComboBox = nullptr;
     QPushButton *mAdd = nullptr;
     QPushButton *mRemove = nullptr;
 
@@ -117,7 +117,8 @@
     d->mLayout = new QGridLayout(widget);
     d->mLayout->setContentsMargins(0, 0, 0, 0);
 
-    d->mComboBox = new PimCommon::MinimumComboBox(widget);
+    d->mComboBox = new QComboBox(widget);
+    d->mComboBox->setMinimumWidth(50);
     d->mComboBox->setEditable(false);
     Q_ASSERT(d->mComboBox);
     d->mLayout->addWidget(d->mComboBox, 1, 1);
@@ -169,12 +170,12 @@
     setFocusProxy(d->mComboBox);
 
     // now connect the combo box and the widget stack
-    connect(d->mComboBox, QOverload<int>::of(&KComboBox::activated),
+    connect(d->mComboBox, QOverload<int>::of(&QComboBox::activated),
             this, [this](int index) {
         d->slotFilterTypeChanged(index);
     });
 
-    connect(d->mComboBox, QOverload<int>::of(&KComboBox::activated), this, &FilterActionWidget::filterModified);
+    connect(d->mComboBox, QOverload<int>::of(&QComboBox::activated), this, &FilterActionWidget::filterModified);
 
     connect(d->mAdd, &QPushButton::clicked,
             this, [this]() {
diff --git a/src/filter/filteractions/filteractionwithstringlist.cpp b/src/filter/filteractions/filteractionwithstringlist.cpp
--- a/src/filter/filteractions/filteractionwithstringlist.cpp
+++ b/src/filter/filteractions/filteractionwithstringlist.cpp
@@ -19,7 +19,7 @@
 
 #include "filteractionwithstringlist.h"
 
-#include <PimCommon/MinimumComboBox>
+#include <QComboBox>
 
 using namespace MailCommon;
 
@@ -30,31 +30,32 @@
 
 QWidget *FilterActionWithStringList::createParamWidget(QWidget *parent) const
 {
-    PimCommon::MinimumComboBox *comboBox = new PimCommon::MinimumComboBox(parent);
+    auto comboBox = new QComboBox(parent);
+    comboBox->setMinimumWidth(50);
     comboBox->setObjectName(QStringLiteral("combobox"));
     comboBox->setEditable(false);
     comboBox->addItems(mParameterList);
     setParamWidgetValue(comboBox);
 
-    connect(comboBox, QOverload<int>::of(&PimCommon::MinimumComboBox::currentIndexChanged), this, &FilterActionWithStringList::filterActionModified);
+    connect(comboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &FilterActionWithStringList::filterActionModified);
 
     return comboBox;
 }
 
 void FilterActionWithStringList::applyParamWidgetValue(QWidget *paramWidget)
 {
-    mParameter = static_cast<PimCommon::MinimumComboBox *>(paramWidget)->currentText();
+    mParameter = static_cast<QComboBox *>(paramWidget)->currentText();
 }
 
 void FilterActionWithStringList::setParamWidgetValue(QWidget *paramWidget) const
 {
     const int index = mParameterList.indexOf(mParameter);
-    static_cast<PimCommon::MinimumComboBox *>(paramWidget)->setCurrentIndex(index >= 0 ? index : 0);
+    static_cast<QComboBox *>(paramWidget)->setCurrentIndex(index >= 0 ? index : 0);
 }
 
 void FilterActionWithStringList::clearParamWidget(QWidget *paramWidget) const
 {
-    static_cast<PimCommon::MinimumComboBox *>(paramWidget)->setCurrentIndex(0);
+    static_cast<QComboBox *>(paramWidget)->setCurrentIndex(0);
 }
 
 void FilterActionWithStringList::argsFromString(const QString &argsStr)
diff --git a/src/search/searchpatternedit.cpp b/src/search/searchpatternedit.cpp
--- a/src/search/searchpatternedit.cpp
+++ b/src/search/searchpatternedit.cpp
@@ -21,13 +21,12 @@
 #include "widgethandler/rulewidgethandlermanager.h"
 using MailCommon::RuleWidgetHandlerManager;
 #include "mailcommon_debug.h"
-#include <PimCommon/MinimumComboBox>
 
 #include <KLocalizedString>
 #include <QPushButton>
 #include <KLineEdit>
 #include <QIcon>
-
+#include <KComboBox>
 #include <QButtonGroup>
 #include <QByteArray>
 #include <QHBoxLayout>
@@ -41,7 +40,7 @@
 //       the value of the entries in the enum in SearchRuleWidget.
 
 #undef I18N_NOOP
-#define I18N_NOOP(t) 0, t
+#define I18N_NOOP(t) nullptr, t
 #undef I18N_NOOP2
 #define I18N_NOOP2(c, t) c, t
 
@@ -156,7 +155,8 @@
     hlay->setContentsMargins(0, 0, 0, 0);
 
     // initialize the header field combo box
-    mRuleField = new PimCommon::MinimumComboBox(this);
+    mRuleField = new KComboBox(this);
+    mRuleField->setMinimumWidth(50);
     mRuleField->setObjectName(QStringLiteral("mRuleField"));
     mRuleField->setEditable(true);
     KLineEdit *edit = new KLineEdit;
@@ -205,7 +205,7 @@
     // redirect focus to the header field combo box
     setFocusProxy(mRuleField);
 
-    connect(mRuleField, QOverload<const QString &>::of(&KComboBox::activated),
+    connect(mRuleField, QOverload<const QString &>::of(&QComboBox::activated),
             this, &SearchRuleWidget::slotRuleFieldChanged);
     connect(mRuleField, &QComboBox::editTextChanged,
             this, &SearchRuleWidget::slotRuleFieldChanged);
diff --git a/src/search/widgethandler/daterulewidgethandler.cpp b/src/search/widgethandler/daterulewidgethandler.cpp
--- a/src/search/widgethandler/daterulewidgethandler.cpp
+++ b/src/search/widgethandler/daterulewidgethandler.cpp
@@ -19,14 +19,13 @@
 #include "daterulewidgethandler.h"
 #include "search/searchpattern.h"
 
-#include <PimCommon/MinimumComboBox>
-
 #include <KDateComboBox>
 #include <KLocalizedString>
 
 #include <QDate>
 #include <QObject>
 #include <QStackedWidget>
+#include <QComboBox>
 
 using namespace MailCommon;
 
@@ -53,7 +52,8 @@
         return nullptr;
     }
 
-    PimCommon::MinimumComboBox *funcCombo = new PimCommon::MinimumComboBox(functionStack);
+    auto funcCombo = new QComboBox(functionStack);
+    funcCombo->setMinimumWidth(50);
     funcCombo->setObjectName(QStringLiteral("dateRuleFuncCombo"));
     for (int i = 0; i < DateFunctionCount; ++i) {
         funcCombo->addItem(i18n(DateFunctions[i].displayName));
@@ -85,8 +85,7 @@
 SearchRule::Function DateRuleWidgetHandler::currentFunction(
     const QStackedWidget *functionStack) const
 {
-    const PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("dateRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("dateRuleFuncCombo"));
 
     if (funcCombo && funcCombo->currentIndex() >= 0) {
         return DateFunctions[funcCombo->currentIndex()].id;
@@ -153,8 +152,7 @@
 void DateRuleWidgetHandler::reset(QStackedWidget *functionStack, QStackedWidget *valueStack) const
 {
     // reset the function combo box
-    PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("dateRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("dateRuleFuncCombo"));
 
     if (funcCombo) {
         funcCombo->blockSignals(true);
@@ -190,8 +188,7 @@
         }
     }
 
-    PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("dateRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("dateRuleFuncCombo"));
 
     if (funcCombo) {
         funcCombo->blockSignals(true);
diff --git a/src/search/widgethandler/encryptionwidgethandler.cpp b/src/search/widgethandler/encryptionwidgethandler.cpp
--- a/src/search/widgethandler/encryptionwidgethandler.cpp
+++ b/src/search/widgethandler/encryptionwidgethandler.cpp
@@ -17,9 +17,7 @@
 */
 
 #include "encryptionwidgethandler.h"
-
-#include <PimCommon/MinimumComboBox>
-
+#include <QComboBox>
 #include <QStackedWidget>
 #include <QLabel>
 
@@ -52,7 +50,8 @@
         return nullptr;
     }
 
-    auto combo = new PimCommon::MinimumComboBox(functionStack);
+    auto combo = new QComboBox(functionStack);
+    combo->setMinimumWidth(50);
     combo->setObjectName(QStringLiteral("encryptionRuleFuncCombo"));
     for (int i = 0; i < EncryptionFunctionCount; ++i) {
         combo->addItem(i18n(EncryptionFunctions[i].displayName));
@@ -82,7 +81,7 @@
         return SearchRule::FuncNone;
     }
 
-    const auto combo = functionStack->findChild<KComboBox *>(QStringLiteral("encryptionRuleFuncCombo"));
+    const auto combo = functionStack->findChild<QComboBox *>(QStringLiteral("encryptionRuleFuncCombo"));
     if (combo && combo->currentIndex() >= 0) {
         return EncryptionFunctions[combo->currentIndex()].id;
     }
@@ -118,7 +117,7 @@
 
 void EncryptionWidgetHandler::reset(QStackedWidget *functionStack, QStackedWidget *valueStack) const
 {
-    const auto combo = functionStack->findChild<KComboBox *>(QStringLiteral("encryptionRuleFuncCombo"));
+    const auto combo = functionStack->findChild<QComboBox *>(QStringLiteral("encryptionRuleFuncCombo"));
     if (combo) {
         const bool blocked = combo->blockSignals(true);
         combo->setCurrentIndex(0);
@@ -137,7 +136,7 @@
     }
     update("<encryption>", functionStack, valueStack);
 
-    const auto combo = functionStack->findChild<KComboBox *>(QStringLiteral("encryptionRuleFuncCombo"));
+    const auto combo = functionStack->findChild<QComboBox *>(QStringLiteral("encryptionRuleFuncCombo"));
     if (combo) {
         const bool blocked = combo->blockSignals(true);
         for (int i = 0; i < EncryptionFunctionCount; ++i) {
diff --git a/src/search/widgethandler/headersrulerwidgethandler.cpp b/src/search/widgethandler/headersrulerwidgethandler.cpp
--- a/src/search/widgethandler/headersrulerwidgethandler.cpp
+++ b/src/search/widgethandler/headersrulerwidgethandler.cpp
@@ -17,15 +17,15 @@
 */
 
 #include "headersrulerwidgethandler.h"
-#include <PimCommon/MinimumComboBox>
 
 #include "search/searchpattern.h"
 
 #include <KLineEdit>
 #include <KLocalizedString>
 
 #include <QStackedWidget>
 #include <QLabel>
+#include <QComboBox>
 
 using namespace MailCommon;
 
@@ -61,7 +61,8 @@
         return nullptr;
     }
 
-    PimCommon::MinimumComboBox *funcCombo = new PimCommon::MinimumComboBox(functionStack);
+    auto funcCombo = new QComboBox(functionStack);
+    funcCombo->setMinimumWidth(50);
     funcCombo->setObjectName(QStringLiteral("headerRuleFuncCombo"));
     for (int i = 0; i < HeadersFunctionCount; ++i) {
         if (!(isBalooSearch
@@ -106,8 +107,7 @@
 SearchRule::Function HeadersRuleWidgetHandler::currentFunction(
     const QStackedWidget *functionStack) const
 {
-    const PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("headerRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("headerRuleFuncCombo"));
 
     if (funcCombo && funcCombo->currentIndex() >= 0) {
         return HeaderFunctions[funcCombo->currentIndex()].id;
@@ -189,7 +189,7 @@
 void HeadersRuleWidgetHandler::reset(QStackedWidget *functionStack, QStackedWidget *valueStack) const
 {
     // reset the function combo box
-    PimCommon::MinimumComboBox *funcCombo = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("headerRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("headerRuleFuncCombo"));
 
     if (funcCombo) {
         funcCombo->blockSignals(true);
@@ -232,7 +232,7 @@
         }
     }
 
-    PimCommon::MinimumComboBox *funcCombo = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("headerRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("headerRuleFuncCombo"));
 
     if (funcCombo) {
         funcCombo->blockSignals(true);
diff --git a/src/search/widgethandler/messagerulewidgethandler.cpp b/src/search/widgethandler/messagerulewidgethandler.cpp
--- a/src/search/widgethandler/messagerulewidgethandler.cpp
+++ b/src/search/widgethandler/messagerulewidgethandler.cpp
@@ -19,12 +19,11 @@
 #include "messagerulewidgethandler.h"
 #include "search/searchpattern.h"
 
-#include <PimCommon/MinimumComboBox>
-
 #include <KLocalizedString>
 #include <KLineEdit>
 #include <QStackedWidget>
 #include <QLabel>
+#include <QComboBox>
 
 using namespace MailCommon;
 
@@ -53,7 +52,8 @@
         return nullptr;
     }
 
-    PimCommon::MinimumComboBox *funcCombo = new PimCommon::MinimumComboBox(functionStack);
+    auto *funcCombo = new QComboBox(functionStack);
+    funcCombo->setMinimumWidth(50);
     funcCombo->setObjectName(QStringLiteral("messageRuleFuncCombo"));
     for (int i = 0; i < MessageFunctionCount; ++i) {
         if (!(isBalooSearch && (MessageFunctions[i].id == SearchRule::FuncHasAttachment || MessageFunctions[i].id == SearchRule::FuncHasNoAttachment))) {
@@ -96,8 +96,7 @@
 SearchRule::Function MessageRuleWidgetHandler::currentFunction(
     const QStackedWidget *functionStack) const
 {
-    const PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("messageRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("messageRuleFuncCombo"));
 
     if (funcCombo && funcCombo->currentIndex() >= 0) {
         return MessageFunctions[funcCombo->currentIndex()].id;
@@ -178,7 +177,7 @@
 void MessageRuleWidgetHandler::reset(QStackedWidget *functionStack, QStackedWidget *valueStack) const
 {
     // reset the function combo box
-    PimCommon::MinimumComboBox *funcCombo = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("messageRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("messageRuleFuncCombo"));
 
     if (funcCombo) {
         funcCombo->blockSignals(true);
@@ -222,8 +221,7 @@
         }
     }
 
-    PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("messageRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("messageRuleFuncCombo"));
 
     if (funcCombo) {
         funcCombo->blockSignals(true);
diff --git a/src/search/widgethandler/numericdoublerulewidgethandler.cpp b/src/search/widgethandler/numericdoublerulewidgethandler.cpp
--- a/src/search/widgethandler/numericdoublerulewidgethandler.cpp
+++ b/src/search/widgethandler/numericdoublerulewidgethandler.cpp
@@ -17,13 +17,13 @@
 */
 
 #include "numericdoublerulewidgethandler.h"
-#include <PimCommon/MinimumComboBox>
 #include "search/searchpattern.h"
 
 #include <KLocalizedString>
 
 #include <QDoubleSpinBox>
 #include <QStackedWidget>
+#include <QComboBox>
 
 using namespace MailCommon;
 
@@ -48,7 +48,8 @@
         return nullptr;
     }
 
-    PimCommon::MinimumComboBox *funcCombo = new PimCommon::MinimumComboBox(functionStack);
+    auto funcCombo = new QComboBox(functionStack);
+    funcCombo->setMinimumWidth(50);
     funcCombo->setObjectName(QStringLiteral("numericDoubleRuleFuncCombo"));
     for (int i = 0; i < NumericFunctionCount; ++i) {
         funcCombo->addItem(i18n(NumericFunctions[i].displayName));
@@ -79,8 +80,7 @@
 SearchRule::Function NumericDoubleRuleWidgetHandler::currentFunction(
     const QStackedWidget *functionStack) const
 {
-    const PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("numericDoubleRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("numericDoubleRuleFuncCombo"));
 
     if (funcCombo && funcCombo->currentIndex() >= 0) {
         return NumericFunctions[funcCombo->currentIndex()].id;
@@ -147,8 +147,7 @@
 void NumericDoubleRuleWidgetHandler::reset(QStackedWidget *functionStack, QStackedWidget *valueStack) const
 {
     // reset the function combo box
-    PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("numericDoubleRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("numericDoubleRuleFuncCombo"));
 
     if (funcCombo) {
         funcCombo->blockSignals(true);
@@ -196,8 +195,7 @@
         }
     }
 
-    PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("numericDoubleRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("numericDoubleRuleFuncCombo"));
 
     if (funcCombo) {
         funcCombo->blockSignals(true);
diff --git a/src/search/widgethandler/numericrulewidgethandler.cpp b/src/search/widgethandler/numericrulewidgethandler.cpp
--- a/src/search/widgethandler/numericrulewidgethandler.cpp
+++ b/src/search/widgethandler/numericrulewidgethandler.cpp
@@ -19,12 +19,11 @@
 #include "numericrulewidgethandler.h"
 #include "search/searchpattern.h"
 
-#include <PimCommon/MinimumComboBox>
-
 #include <KPluralHandlingSpinBox>
 #include <KLocalizedString>
 
 #include <QStackedWidget>
+#include <QComboBox>
 
 using namespace MailCommon;
 
@@ -51,7 +50,8 @@
         return nullptr;
     }
 
-    PimCommon::MinimumComboBox *funcCombo = new PimCommon::MinimumComboBox(functionStack);
+    auto funcCombo = new QComboBox(functionStack);
+    funcCombo->setMinimumWidth(50);
     funcCombo->setObjectName(QStringLiteral("numericRuleFuncCombo"));
     for (int i = 0; i < NumericFunctionCount; ++i) {
         funcCombo->addItem(i18n(NumericFunctions[i].displayName));
@@ -82,8 +82,7 @@
 SearchRule::Function NumericRuleWidgetHandler::currentFunction(
     const QStackedWidget *functionStack) const
 {
-    const PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("numericRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("numericRuleFuncCombo"));
 
     if (funcCombo && funcCombo->currentIndex() >= 0) {
         return NumericFunctions[funcCombo->currentIndex()].id;
@@ -150,8 +149,7 @@
 void NumericRuleWidgetHandler::reset(QStackedWidget *functionStack, QStackedWidget *valueStack) const
 {
     // reset the function combo box
-    PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("numericRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("numericRuleFuncCombo"));
 
     if (funcCombo) {
         funcCombo->blockSignals(true);
@@ -197,8 +195,7 @@
         }
     }
 
-    PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("numericRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("numericRuleFuncCombo"));
 
     if (funcCombo) {
         funcCombo->blockSignals(true);
diff --git a/src/search/widgethandler/statusrulewidgethandler.cpp b/src/search/widgethandler/statusrulewidgethandler.cpp
--- a/src/search/widgethandler/statusrulewidgethandler.cpp
+++ b/src/search/widgethandler/statusrulewidgethandler.cpp
@@ -18,10 +18,9 @@
 
 #include "statusrulewidgethandler.h"
 #include "search/searchrule/searchrulestatus.h"
-#include <PimCommon/MinimumComboBox>
 
 #include <KIconLoader>
-
+#include <QComboBox>
 #include <QStackedWidget>
 
 using namespace MailCommon;
@@ -45,7 +44,8 @@
         return nullptr;
     }
 
-    PimCommon::MinimumComboBox *funcCombo = new PimCommon::MinimumComboBox(functionStack);
+    auto *funcCombo = new QComboBox(functionStack);
+    funcCombo->setMinimumWidth(50);
     funcCombo->setObjectName(QStringLiteral("statusRuleFuncCombo"));
     for (int i = 0; i < StatusFunctionCount; ++i) {
         funcCombo->addItem(i18n(StatusFunctions[i].displayName));
@@ -64,7 +64,8 @@
         return nullptr;
     }
 
-    PimCommon::MinimumComboBox *statusCombo = new PimCommon::MinimumComboBox(valueStack);
+    auto *statusCombo = new QComboBox(valueStack);
+    statusCombo->setMinimumWidth(50);
     statusCombo->setObjectName(QStringLiteral("statusRuleValueCombo"));
     for (int i = 0; i < MailCommon::StatusValueCountWithoutHidden; ++i) {
         if (MailCommon::StatusValues[ i ].icon != nullptr) {
@@ -87,8 +88,7 @@
 SearchRule::Function StatusRuleWidgetHandler::currentFunction(
     const QStackedWidget *functionStack) const
 {
-    const PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("statusRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("statusRuleFuncCombo"));
 
     if (funcCombo && funcCombo->currentIndex() >= 0) {
         return StatusFunctions[funcCombo->currentIndex()].id;
@@ -112,8 +112,7 @@
 
 int StatusRuleWidgetHandler::currentStatusValue(const QStackedWidget *valueStack) const
 {
-    const PimCommon::MinimumComboBox *statusCombo
-        = valueStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("statusRuleValueCombo"));
+    const auto statusCombo = valueStack->findChild<QComboBox*>(QStringLiteral("statusRuleValueCombo"));
 
     if (statusCombo) {
         return statusCombo->currentIndex();
@@ -166,18 +165,16 @@
 void StatusRuleWidgetHandler::reset(QStackedWidget *functionStack, QStackedWidget *valueStack) const
 {
     // reset the function combo box
-    PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("statusRuleFuncCombo"));
+    auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("statusRuleFuncCombo"));
 
     if (funcCombo) {
         funcCombo->blockSignals(true);
         funcCombo->setCurrentIndex(0);
         funcCombo->blockSignals(false);
     }
 
     // reset the status value combo box
-    PimCommon::MinimumComboBox *statusCombo
-        = valueStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("statusRuleValueCombo"));
+    auto statusCombo = valueStack->findChild<QComboBox *>(QStringLiteral("statusRuleValueCombo"));
 
     if (statusCombo) {
         statusCombo->blockSignals(true);
@@ -204,8 +201,7 @@
         }
     }
 
-    PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("statusRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("statusRuleFuncCombo"));
 
     if (funcCombo) {
         funcCombo->blockSignals(true);
@@ -227,8 +223,7 @@
         }
     }
 
-    PimCommon::MinimumComboBox *statusCombo
-        = valueStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("statusRuleValueCombo"));
+    const auto statusCombo = valueStack->findChild<QComboBox *>(QStringLiteral("statusRuleValueCombo"));
 
     if (statusCombo) {
         statusCombo->blockSignals(true);
diff --git a/src/search/widgethandler/tagrulewidgethandler.cpp b/src/search/widgethandler/tagrulewidgethandler.cpp
--- a/src/search/widgethandler/tagrulewidgethandler.cpp
+++ b/src/search/widgethandler/tagrulewidgethandler.cpp
@@ -19,7 +19,6 @@
 #include "tagrulewidgethandler.h"
 #include "search/searchpattern.h"
 #include "mailcommon_debug.h"
-#include <PimCommon/MinimumComboBox>
 
 #include <QIcon>
 #include <KLocalizedString>
@@ -33,24 +32,25 @@
 
 #include <QLineEdit>
 #include <QStackedWidget>
+#include <QComboBox>
 
 using namespace MailCommon;
 
 class FillTagComboJob : public KJob
 {
     Q_OBJECT
 public:
-    explicit FillTagComboJob(KComboBox *combo, QObject *parent = nullptr);
+    explicit FillTagComboJob(QComboBox *combo, QObject *parent = nullptr);
     void start() override;
 private Q_SLOTS:
     void onDestroyed();
     void onTagsFetched(KJob *);
 
 private:
-    KComboBox *mComboBox = nullptr;
+    QComboBox *mComboBox = nullptr;
 };
 
-FillTagComboJob::FillTagComboJob(KComboBox *combo, QObject *parent)
+FillTagComboJob::FillTagComboJob(QComboBox *combo, QObject *parent)
     : KJob(parent)
     , mComboBox(combo)
 {
@@ -122,7 +122,8 @@
         return nullptr;
     }
 
-    PimCommon::MinimumComboBox *funcCombo = new PimCommon::MinimumComboBox(functionStack);
+    const auto funcCombo = new QComboBox(functionStack);
+    funcCombo->setMinimumWidth(50);
     funcCombo->setObjectName(QStringLiteral("tagRuleFuncCombo"));
     for (int i = 0; i < TagFunctionCount; ++i) {
         if (isBalooSearch) {
@@ -156,7 +157,8 @@
     }
 
     if (number == 1) {
-        PimCommon::MinimumComboBox *valueCombo = new PimCommon::MinimumComboBox(valueStack);
+        const auto valueCombo = new QComboBox(valueStack);
+        valueCombo->setMinimumWidth(50);
         valueCombo->setObjectName(QStringLiteral("tagRuleValueCombo"));
         valueCombo->setEditable(true);
         valueCombo->addItem(QString());   // empty entry for user input
@@ -181,8 +183,7 @@
         return SearchRule::FuncNone;
     }
 
-    const PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("tagRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("tagRuleFuncCombo"));
 
     if (funcCombo && funcCombo->currentIndex() >= 0) {
         return TagFunctions[funcCombo->currentIndex()].id;
@@ -212,8 +213,7 @@
     }
 
     // Use combo box
-    const PimCommon::MinimumComboBox *tagCombo
-        = valueStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("tagRuleValueCombo"));
+    const auto tagCombo = valueStack->findChild<QComboBox *>(QStringLiteral("tagRuleValueCombo"));
 
     if (tagCombo) {
         return tagCombo->itemData(tagCombo->currentIndex()).toString();
@@ -241,8 +241,7 @@
 void TagRuleWidgetHandler::reset(QStackedWidget *functionStack, QStackedWidget *valueStack) const
 {
     // reset the function combo box
-    PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("tagRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("tagRuleFuncCombo"));
 
     if (funcCombo) {
         funcCombo->blockSignals(true);
@@ -263,7 +262,7 @@
         valueStack->setCurrentWidget(lineEdit);
     }
 
-    PimCommon::MinimumComboBox *tagCombo = valueStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("tagRuleValueCombo"));
+    const auto tagCombo = valueStack->findChild<QComboBox *>(QStringLiteral("tagRuleValueCombo"));
     if (tagCombo) {
         tagCombo->blockSignals(true);
         tagCombo->setCurrentIndex(0);
@@ -297,8 +296,7 @@
         }
     }
 
-    PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("tagRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("tagRuleFuncCombo"));
 
     if (funcCombo) {
         funcCombo->blockSignals(true);
@@ -326,8 +324,7 @@
         }
     } else {
         // set combo box value
-        PimCommon::MinimumComboBox *tagCombo
-            = valueStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("tagRuleValueCombo"));
+        const auto tagCombo = valueStack->findChild<QComboBox *>(QStringLiteral("tagRuleValueCombo"));
 
         if (tagCombo) {
             tagCombo->blockSignals(true);
diff --git a/src/search/widgethandler/textrulerwidgethandler.cpp b/src/search/widgethandler/textrulerwidgethandler.cpp
--- a/src/search/widgethandler/textrulerwidgethandler.cpp
+++ b/src/search/widgethandler/textrulerwidgethandler.cpp
@@ -17,12 +17,11 @@
 */
 
 #include "textrulerwidgethandler.h"
-#include <PimCommon/MinimumComboBox>
 
 #include "search/searchpattern.h"
 #include <KLineEdit>
 #include <KLocalizedString>
-
+#include <QComboBox>
 #include <QStackedWidget>
 
 using namespace MailCommon;
@@ -59,7 +58,8 @@
         return nullptr;
     }
 
-    PimCommon::MinimumComboBox *funcCombo = new PimCommon::MinimumComboBox(functionStack);
+    auto *funcCombo = new QComboBox(functionStack);
+    funcCombo->setMinimumWidth(50);
     funcCombo->setObjectName(QStringLiteral("textRuleFuncCombo"));
     for (int i = 0; i < TextFunctionCount; ++i) {
         funcCombo->addItem(i18n(TextFunctions[i].displayName));
@@ -101,8 +101,7 @@
 SearchRule::Function TextRuleWidgetHandler::currentFunction(
     const QStackedWidget *functionStack) const
 {
-    const PimCommon::MinimumComboBox *funcCombo
-        = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("textRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("textRuleFuncCombo"));
 
     if (funcCombo && funcCombo->currentIndex() >= 0) {
         return TextFunctions[funcCombo->currentIndex()].id;
@@ -161,7 +160,7 @@
 void TextRuleWidgetHandler::reset(QStackedWidget *functionStack, QStackedWidget *valueStack) const
 {
     // reset the function combo box
-    PimCommon::MinimumComboBox *funcCombo = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("textRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("textRuleFuncCombo"));
 
     if (funcCombo) {
         funcCombo->blockSignals(true);
@@ -198,7 +197,7 @@
         }
     }
 
-    PimCommon::MinimumComboBox *funcCombo = functionStack->findChild<PimCommon::MinimumComboBox *>(QStringLiteral("textRuleFuncCombo"));
+    const auto funcCombo = functionStack->findChild<QComboBox *>(QStringLiteral("textRuleFuncCombo"));
 
     if (funcCombo) {
         funcCombo->blockSignals(true);