diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionremoveflags.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionremoveflags.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionremoveflags.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionremoveflags.cpp
@@ -18,7 +18,6 @@
 */
 #include "sieveactionremoveflags.h"
 #include "editor/sieveeditorutil.h"
-#include <PimCommon/MinimumComboBox>
 
 #include <KLocalizedString>
 
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionsetflags.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionsetflags.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionsetflags.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionsetflags.cpp
@@ -18,7 +18,6 @@
 */
 #include "sieveactionsetflags.h"
 #include "editor/sieveeditorutil.h"
-#include <PimCommon/MinimumComboBox>
 
 #include <KLocalizedString>
 
diff --git a/src/ksieveui/autocreatescripts/sieveactionwidgetlister.h b/src/ksieveui/autocreatescripts/sieveactionwidgetlister.h
--- a/src/ksieveui/autocreatescripts/sieveactionwidgetlister.h
+++ b/src/ksieveui/autocreatescripts/sieveactionwidgetlister.h
@@ -23,15 +23,11 @@
 #include <Libkdepim/KWidgetLister>
 #include "sieveglobalvariablewidget.h"
 class QPushButton;
-
+class QComboBox;
 class QGridLayout;
 class QToolButton;
 class QXmlStreamReader;
 
-namespace PimCommon {
-class MinimumComboBox;
-}
-
 namespace KSieveUi {
 class SieveAction;
 class SieveHelpButton;
@@ -68,7 +64,7 @@
     QList<KSieveUi::SieveAction *> mActionList;
     QPushButton *mAdd = nullptr;
     QPushButton *mRemove = nullptr;
-    PimCommon::MinimumComboBox *mComboBox = nullptr;
+    QComboBox *mComboBox = nullptr;
     QGridLayout *mLayout = nullptr;
     SieveHelpButton *mHelpButton = nullptr;
     QToolButton *mCommentButton = nullptr;
diff --git a/src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp b/src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp
--- a/src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp
@@ -25,14 +25,15 @@
 #include "sieveactions/sieveactionlist.h"
 #include "commonwidgets/sievehelpbutton.h"
 #include "autocreatescriptutil_p.h"
-#include <PimCommon/MinimumComboBox>
 
 #include <QPushButton>
 #include <KLocalizedString>
 #include <QIcon>
 
+#include <QComboBox>
 #include <QGridLayout>
 #include <QLabel>
+#include <QPointer>
 #include "libksieve_debug.h"
 #include <QToolButton>
 #include <QWhatsThis>
@@ -114,8 +115,9 @@
     mLayout = new QGridLayout(this);
     mLayout->setContentsMargins(0, 0, 0, 0);
 
-    mComboBox = new PimCommon::MinimumComboBox;
+    mComboBox = new QComboBox;
     mComboBox->setEditable(false);
+    mComboBox->setMinimumWidth(50);
     const QList<KSieveUi::SieveAction *> list = KSieveUi::SieveActionList::actionList(mSieveGraphicalModeWidget);
     QList<KSieveUi::SieveAction *>::const_iterator it;
     QList<KSieveUi::SieveAction *>::const_iterator end(list.constEnd());
@@ -165,7 +167,7 @@
 
     updateGeometry();
 
-    connect(mComboBox, QOverload<int>::of(&PimCommon::MinimumComboBox::activated), this, &SieveActionWidget::slotActionChanged);
+    connect(mComboBox, QOverload<int>::of(&QComboBox::activated), this, &SieveActionWidget::slotActionChanged);
 
     mAdd = new QPushButton(this);
     mAdd->setIcon(QIcon::fromTheme(QStringLiteral("list-add")));
diff --git a/src/ksieveui/autocreatescripts/sieveconditionwidgetlister.h b/src/ksieveui/autocreatescripts/sieveconditionwidgetlister.h
--- a/src/ksieveui/autocreatescripts/sieveconditionwidgetlister.h
+++ b/src/ksieveui/autocreatescripts/sieveconditionwidgetlister.h
@@ -26,10 +26,7 @@
 class QGridLayout;
 class QXmlStreamReader;
 class QToolButton;
-
-namespace PimCommon {
-class MinimumComboBox;
-}
+class QComboBox;
 
 namespace KSieveUi {
 class SieveCondition;
@@ -63,7 +60,7 @@
     QList<KSieveUi::SieveCondition *> mConditionList;
     QPushButton *mAdd = nullptr;
     QPushButton *mRemove = nullptr;
-    PimCommon::MinimumComboBox *mComboBox = nullptr;
+    QComboBox *mComboBox = nullptr;
     QGridLayout *mLayout = nullptr;
     SieveHelpButton *mHelpButton = nullptr;
     QToolButton *mCommentButton = nullptr;
diff --git a/src/ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp b/src/ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp
@@ -25,11 +25,12 @@
 #include "sieveeditorgraphicalmodewidget.h"
 #include "sieveconditions/sieveconditionlist.h"
 #include "sieveconditions/sievecondition.h"
-#include <PimCommon/MinimumComboBox>
 
 #include <QPushButton>
 #include <KLocalizedString>
 #include <QIcon>
+#include <QComboBox>
+#include <QPointer>
 
 #include <QGridLayout>
 #include <QLabel>
@@ -89,7 +90,8 @@
     mLayout = new QGridLayout(this);
     mLayout->setContentsMargins(0, 0, 0, 0);
 
-    mComboBox = new PimCommon::MinimumComboBox;
+    mComboBox = new QComboBox;
+    mComboBox->setMinimumWidth(50);
     mComboBox->setEditable(false);
 
     const QList<KSieveUi::SieveCondition *> list = KSieveUi::SieveConditionList::conditionList(mSieveGraphicalModeWidget);
@@ -128,7 +130,7 @@
 
     mComboBox->addItem(QLatin1String(""));
     mLayout->addWidget(mComboBox, 1, 2);
-    connect(mComboBox, QOverload<int>::of(&PimCommon::MinimumComboBox::activated), this, &SieveConditionWidget::slotConditionChanged);
+    connect(mComboBox, QOverload<int>::of(&QComboBox::activated), this, &SieveConditionWidget::slotConditionChanged);
 
     mComboBox->setMaxCount(mComboBox->count());
     mComboBox->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed));