diff --git a/agents/archivemailagent/archivemailwidget.h b/agents/archivemailagent/archivemailwidget.h
index b6241ea7f..5804ebc63 100644
--- a/agents/archivemailagent/archivemailwidget.h
+++ b/agents/archivemailagent/archivemailwidget.h
@@ -61,7 +61,6 @@ public:
     QSize restoreDialogSize() const override;
     void saveDialogSize(const QSize &size) override;
 
-
 private:
     void createOrUpdateItem(ArchiveMailInfo *info, ArchiveMailItem *item = nullptr);
     bool verifyExistingArchive(ArchiveMailInfo *info) const;
diff --git a/agents/followupreminderagent/followupremindermanager.cpp b/agents/followupreminderagent/followupremindermanager.cpp
index a4c603ed8..d38031a96 100644
--- a/agents/followupreminderagent/followupremindermanager.cpp
+++ b/agents/followupreminderagent/followupremindermanager.cpp
@@ -26,7 +26,6 @@
 #include "jobs/followupreminderfinishtaskjob.h"
 #include <Akonadi/KMime/SpecialMailCollections>
 
-
 #include <KConfigGroup>
 #include <KConfig>
 #include <KSharedConfig>
diff --git a/kmail-refresh-settings/refreshsettingsassistant.cpp b/kmail-refresh-settings/refreshsettingsassistant.cpp
index de220d589..7b9df25cd 100644
--- a/kmail-refresh-settings/refreshsettingsassistant.cpp
+++ b/kmail-refresh-settings/refreshsettingsassistant.cpp
@@ -17,7 +17,6 @@
    Boston, MA 02110-1301, USA.
 */
 
-
 #include "refreshsettingsassistant.h"
 #include "refreshsettingscleanuppage.h"
 #include "refreshsettingsfirstpage.h"
@@ -47,12 +46,11 @@ RefreshSettingsAssistant::RefreshSettingsAssistant(QWidget *parent)
 
 RefreshSettingsAssistant::~RefreshSettingsAssistant()
 {
-
 }
 
 void RefreshSettingsAssistant::initializePages()
 {
-    mFirstPage  = new RefreshSettingsFirstPage(this);
+    mFirstPage = new RefreshSettingsFirstPage(this);
     mFirstPageItem = new KPageWidgetItem(mFirstPage, i18n("Warning"));
     addPage(mFirstPageItem);
 
@@ -63,6 +61,4 @@ void RefreshSettingsAssistant::initializePages()
     mFinishPage = new RefreshSettringsFinishPage(this);
     mFinishPageItem = new KPageWidgetItem(mFinishPage, i18n("Finish"));
     addPage(mFinishPageItem);
-
-
 }
diff --git a/kmail-refresh-settings/refreshsettingscleanuppage.cpp b/kmail-refresh-settings/refreshsettingscleanuppage.cpp
index 867f2a56b..8ccccde24 100644
--- a/kmail-refresh-settings/refreshsettingscleanuppage.cpp
+++ b/kmail-refresh-settings/refreshsettingscleanuppage.cpp
@@ -31,5 +31,4 @@ RefreshSettingsCleanupPage::RefreshSettingsCleanupPage(QWidget *parent)
 
 RefreshSettingsCleanupPage::~RefreshSettingsCleanupPage()
 {
-
 }
diff --git a/kmail-refresh-settings/refreshsettingsfirstpage.cpp b/kmail-refresh-settings/refreshsettingsfirstpage.cpp
index 29ba8e925..5f9e04592 100644
--- a/kmail-refresh-settings/refreshsettingsfirstpage.cpp
+++ b/kmail-refresh-settings/refreshsettingsfirstpage.cpp
@@ -32,5 +32,4 @@ RefreshSettingsFirstPage::RefreshSettingsFirstPage(QWidget *parent)
 
 RefreshSettingsFirstPage::~RefreshSettingsFirstPage()
 {
-
 }
diff --git a/kmail-refresh-settings/refreshsettringsfinishpage.cpp b/kmail-refresh-settings/refreshsettringsfinishpage.cpp
index 29c6b6f6d..603628b76 100644
--- a/kmail-refresh-settings/refreshsettringsfinishpage.cpp
+++ b/kmail-refresh-settings/refreshsettringsfinishpage.cpp
@@ -17,7 +17,6 @@
    Boston, MA 02110-1301, USA.
 */
 
-
 #include "refreshsettringsfinishpage.h"
 #include <QHBoxLayout>
 #include <KLocalizedString>
@@ -32,5 +31,4 @@ RefreshSettringsFinishPage::RefreshSettringsFinishPage(QWidget *parent)
 
 RefreshSettringsFinishPage::~RefreshSettringsFinishPage()
 {
-
 }
diff --git a/ktnef/src/main.cpp b/ktnef/src/main.cpp
index 03065a9df..619f78d47 100644
--- a/ktnef/src/main.cpp
+++ b/ktnef/src/main.cpp
@@ -27,7 +27,7 @@
 
 int main(int argc, char *argv[])
 {
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true); 
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
     QApplication app(argc, argv);
     KLocalizedString::setApplicationDomain("ktnef");
     app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
diff --git a/src/editor/kmcomposerglobalaction.cpp b/src/editor/kmcomposerglobalaction.cpp
index f8341d701..0ef6ec75a 100644
--- a/src/editor/kmcomposerglobalaction.cpp
+++ b/src/editor/kmcomposerglobalaction.cpp
@@ -129,7 +129,6 @@ void KMComposerGlobalAction::slotMarkAll()
     }
 }
 
-
 void KMComposerGlobalAction::slotInsertEmoticon(const QString &str)
 {
     QWidget *fw = mComposerWin->focusWidget();
diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp
index d71bd047e..b1fdd3eed 100644
--- a/src/editor/kmcomposerwin.cpp
+++ b/src/editor/kmcomposerwin.cpp
@@ -1094,7 +1094,6 @@ void KMComposerWin::setupActions()
         mRecentAction->addUrl(QUrl(url));
     }
 
-
     action = new QAction(QIcon::fromTheme(QStringLiteral("x-office-address-book")), i18n("&Address Book"), this);
     KMail::Util::addQActionHelpText(action, i18n("Open Address Book"));
     actionCollection()->addAction(QStringLiteral("addressbook"), action);
diff --git a/src/kmcommands.cpp b/src/kmcommands.cpp
index c26bc1df0..40423ab6f 100644
--- a/src/kmcommands.cpp
+++ b/src/kmcommands.cpp
@@ -801,7 +801,7 @@ void KMOpenMsgCommand::slotResult(KJob *job)
         // check for multiple messages in the file
         bool multipleMessages = true;
         int endOfMessage = mMsgString.indexOf(QLatin1String("\nFrom "), startOfMessage);
-        while(endOfMessage != -1) {
+        while (endOfMessage != -1) {
             KMime::Message *msg = new KMime::Message;
             msg->setContent(KMime::CRLFtoLF(mMsgString.mid(startOfMessage, endOfMessage - startOfMessage).toUtf8()));
             msg->parse();
@@ -830,7 +830,6 @@ void KMOpenMsgCommand::slotResult(KJob *job)
             }
             KMime::Message::Ptr mMsg(msg);
             listMessages << mMsg;
-
         }
         KMReaderMainWin *win = new KMReaderMainWin();
         win->showMessage(mEncoding, listMessages);
diff --git a/src/kmreaderwin.cpp b/src/kmreaderwin.cpp
index cb59450e1..e4231d901 100644
--- a/src/kmreaderwin.cpp
+++ b/src/kmreaderwin.cpp
@@ -105,7 +105,6 @@ KMReaderWin::KMReaderWin(QWidget *aParent, QWidget *mainWindow, KActionCollectio
     connect(mViewer, &MessageViewer::Viewer::showNextMessage, this, &KMReaderWin::showNextMessage);
     connect(mViewer, &MessageViewer::Viewer::showPreviousMessage, this, &KMReaderWin::showPreviousMessage);
 
-
     mViewer->addMessageLoadedHandler(new MessageViewer::MarkMessageReadHandler(this));
     mViewer->addMessageLoadedHandler(new MailCommon::SendMdnHandler(kmkernel, this));
 
@@ -250,6 +249,7 @@ void KMReaderWin::clearCache()
 {
     clear();
 }
+
 void KMReaderWin::updateShowMultiMessagesButton(bool enablePreviousButton, bool enableNextButton)
 {
     mViewer->updateShowMultiMessagesButton(enablePreviousButton, enableNextButton);