diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a3b0c08d..9bb3d08bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,12 +65,12 @@ option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE)
 
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets)
 set(LIBGRAVATAR_VERSION_LIB "5.14.40")
-set(MAILCOMMON_LIB_VERSION_LIB "5.14.41")
+set(MAILCOMMON_LIB_VERSION_LIB "5.14.42")
 set(KDEPIM_APPS_LIB_VERSION_LIB "5.14.40")
 set(MESSAGELIB_LIB_VERSION_LIB "5.14.42")
 set(LIBKLEO_LIB_VERSION_LIB "5.14.40")
 set(PIMCOMMON_LIB_VERSION_LIB "5.14.41")
-set(LIBKDEPIM_LIB_VERSION_LIB "5.14.40")
+set(LIBKDEPIM_LIB_VERSION_LIB "5.14.41")
 set(LIBKSIEVE_LIB_VERSION_LIB "5.14.40")
 
 find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
diff --git a/agents/archivemailagent/addarchivemaildialog.cpp b/agents/archivemailagent/addarchivemaildialog.cpp
index 56c83832f..2ea7df06c 100644
--- a/agents/archivemailagent/addarchivemaildialog.cpp
+++ b/agents/archivemailagent/addarchivemaildialog.cpp
@@ -25,6 +25,7 @@
 
 #include <KLocalizedString>
 #include <KUrlRequester>
+#include <KLineEdit>
 #include <QSpinBox>
 #include <KSeparator>
 #include <QIcon>
diff --git a/src/identity/identitydialog.cpp b/src/identity/identitydialog.cpp
index 99104c147..2f67e1f8e 100644
--- a/src/identity/identitydialog.cpp
+++ b/src/identity/identitydialog.cpp
@@ -67,6 +67,7 @@
 #include <PimCommon/PimUtil>
 
 #include <LibkdepimAkonadi/AddresseeLineEdit>
+#include <Libkdepim/LineEditCatchReturnKey>
 // libkleopatra:
 #include <Libkleo/KeySelectionCombo>
 #include <Libkleo/DefaultKeyFilter>
@@ -303,7 +304,8 @@ IdentityDialog::IdentityDialog(QWidget *parent)
 
     // "Name" line edit and label:
     ++row;
-    mNameEdit = new KLineEdit(tab);
+    mNameEdit = new QLineEdit(tab);
+    new LineEditCatchReturnKey(mNameEdit, this);
     glay->addWidget(mNameEdit, row, 1);
     QLabel *label = new QLabel(i18n("&Your name:"), tab);
     label->setBuddy(mNameEdit);
@@ -318,7 +320,8 @@ IdentityDialog::IdentityDialog(QWidget *parent)
 
     // "Organization" line edit and label:
     ++row;
-    mOrganizationEdit = new KLineEdit(tab);
+    mOrganizationEdit = new QLineEdit(tab);
+    new LineEditCatchReturnKey(mOrganizationEdit, this);
     glay->addWidget(mOrganizationEdit, row, 1);
     label = new QLabel(i18n("Organi&zation:"), tab);
     label->setBuddy(mOrganizationEdit);
@@ -334,7 +337,8 @@ IdentityDialog::IdentityDialog(QWidget *parent)
     // "Email Address" line edit and label:
     // (row 3: spacer)
     ++row;
-    mEmailEdit = new KLineEdit(tab);
+    mEmailEdit = new QLineEdit(tab);
+    new LineEditCatchReturnKey(mEmailEdit, this);
     glay->addWidget(mEmailEdit, row, 1);
     label = new QLabel(i18n("&Email address:"), tab);
     label->setBuddy(mEmailEdit);
@@ -625,7 +629,8 @@ IdentityDialog::IdentityDialog(QWidget *parent)
     // "default domain" input field:
     ++row;
     QHBoxLayout *hbox = new QHBoxLayout;
-    mDefaultDomainEdit = new KLineEdit(tab);
+    mDefaultDomainEdit = new QLineEdit(tab);
+    new LineEditCatchReturnKey(mDefaultDomainEdit, this);
     mDefaultDomainEdit->setClearButtonEnabled(true);
     hbox->addWidget(mDefaultDomainEdit);
     QToolButton *restoreDefaultDomainName = new QToolButton;
diff --git a/src/identity/identitydialog.h b/src/identity/identitydialog.h
index 8a11b5f57..2ae0c3384 100644
--- a/src/identity/identitydialog.h
+++ b/src/identity/identitydialog.h
@@ -38,7 +38,7 @@ class QCheckBox;
 class KEditListWidget;
 class QComboBox;
 class KJob;
-class KLineEdit;
+class QLineEdit;
 class QPushButton;
 class QTabWidget;
 
@@ -109,9 +109,9 @@ private:
     QString mVcardFilename;
 
     // "general" tab:
-    KLineEdit *mNameEdit = nullptr;
-    KLineEdit *mOrganizationEdit = nullptr;
-    KLineEdit *mEmailEdit = nullptr;
+    QLineEdit *mNameEdit = nullptr;
+    QLineEdit *mOrganizationEdit = nullptr;
+    QLineEdit *mEmailEdit = nullptr;
     KEditListWidget *mAliasEdit = nullptr;
     // "cryptography" tab:
     QWidget *mCryptographyTab = nullptr;
@@ -123,9 +123,9 @@ private:
     QCheckBox *mAutoSign = nullptr;
     QCheckBox *mAutoEncrypt = nullptr;
     // "advanced" tab:
-    KLineEdit *mReplyToEdit = nullptr;
-    KLineEdit *mBccEdit = nullptr;
-    KLineEdit *mCcEdit = nullptr;
+    QLineEdit *mReplyToEdit = nullptr;
+    QLineEdit *mBccEdit = nullptr;
+    QLineEdit *mCcEdit = nullptr;
     Sonnet::DictionaryComboBox *mDictionaryCombo = nullptr;
     IdentityFolderRequester *mFccFolderRequester = nullptr;
     QCheckBox *mSentMailFolderCheck = nullptr;
@@ -136,7 +136,7 @@ private:
     QCheckBox *mAttachMyVCard = nullptr;
     QPushButton *mEditVCard = nullptr;
     PimCommon::AutoCorrectionLanguage *mAutoCorrectionLanguage = nullptr;
-    KLineEdit *mDefaultDomainEdit = nullptr;
+    QLineEdit *mDefaultDomainEdit = nullptr;
 
     // "templates" tab:
     TemplateParser::TemplatesConfiguration *mWidget = nullptr;
diff --git a/src/identity/newidentitydialog.cpp b/src/identity/newidentitydialog.cpp
index edc985908..e910d16f4 100644
--- a/src/identity/newidentitydialog.cpp
+++ b/src/identity/newidentitydialog.cpp
@@ -24,10 +24,10 @@
 #include "newidentitydialog.h"
 
 #include <KIdentityManagement/kidentitymanagement/identitymanager.h>
-
+#include <Libkdepim/LineEditCatchReturnKey>
 #include <PimCommon/PimUtil>
 #include <QComboBox>
-#include <KLineEdit>
+#include <QLineEdit>
 #include <KLocalizedString>
 #include <KSeparator>
 
@@ -66,14 +66,15 @@ NewIdentityDialog::NewIdentityDialog(KIdentityManagement::IdentityManager *manag
     // row 0: line edit with label
     QHBoxLayout *hlay = new QHBoxLayout();  // inherits spacing
     vlay->addLayout(hlay);
-    mLineEdit = new KLineEdit(page);
+    mLineEdit = new QLineEdit(page);
     mLineEdit->setFocus();
     mLineEdit->setClearButtonEnabled(true);
+    new KPIM::LineEditCatchReturnKey(mLineEdit, this);
     QLabel *l = new QLabel(i18n("&New identity:"), page);
     l->setBuddy(mLineEdit);
     hlay->addWidget(l);
     hlay->addWidget(mLineEdit, 1);
-    connect(mLineEdit, &KLineEdit::textChanged, this, &NewIdentityDialog::slotEnableOK);
+    connect(mLineEdit, &QLineEdit::textChanged, this, &NewIdentityDialog::slotEnableOK);
 
     mButtonGroup = new QButtonGroup(page);
 
diff --git a/src/identity/newidentitydialog.h b/src/identity/newidentitydialog.h
index 7046e520c..e78c0b34f 100644
--- a/src/identity/newidentitydialog.h
+++ b/src/identity/newidentitydialog.h
@@ -27,7 +27,7 @@
 #include <QDialog>
 
 class QComboBox;
-class KLineEdit;
+class QLineEdit;
 class QButtonGroup;
 
 namespace KIdentityManagement {
@@ -55,7 +55,7 @@ public:
 private:
     void slotHelp();
     void slotEnableOK(const QString &);
-    KLineEdit *mLineEdit = nullptr;
+    QLineEdit *mLineEdit = nullptr;
     QComboBox *mComboBox = nullptr;
     QButtonGroup *mButtonGroup = nullptr;
     KIdentityManagement::IdentityManager *mIdentityManager = nullptr;