diff --git a/src/editor/kmcomposercreatenewcomposerjob.cpp b/src/editor/kmcomposercreatenewcomposerjob.cpp
index ce2522fc2..e3f824afa 100644
--- a/src/editor/kmcomposercreatenewcomposerjob.cpp
+++ b/src/editor/kmcomposercreatenewcomposerjob.cpp
@@ -40,7 +40,7 @@ void KMComposerCreateNewComposerJob::start()
     mMsg = KMime::Message::Ptr(new KMime::Message());
 
     MessageHelper::initHeader(mMsg, KMKernel::self()->identityManager(), mCurrentIdentity);
-    TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage);
+    TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage, this);
     connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &KMComposerCreateNewComposerJob::slotCreateNewComposer);
     parser->setIdentityManager(KMKernel::self()->identityManager());
     parser->process(mMsg, mCollectionForNewMessage.id());
diff --git a/src/editor/kmcomposerupdatetemplatejob.cpp b/src/editor/kmcomposerupdatetemplatejob.cpp
index 4a57b48f5..0142ebf5a 100644
--- a/src/editor/kmcomposerupdatetemplatejob.cpp
+++ b/src/editor/kmcomposerupdatetemplatejob.cpp
@@ -37,7 +37,7 @@ KMComposerUpdateTemplateJob::~KMComposerUpdateTemplateJob()
 
 void KMComposerUpdateTemplateJob::start()
 {
-    TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage);
+    TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage, this);
     connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &KMComposerUpdateTemplateJob::slotFinished);
     parser->setSelection(mTextSelection);
     parser->setAllowDecryption(true);
diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp
index 945665e60..df39b57e5 100644
--- a/src/editor/kmcomposerwin.cpp
+++ b/src/editor/kmcomposerwin.cpp
@@ -343,7 +343,7 @@ KMComposerWin::KMComposerWin(const KMime::Message::Ptr &aMsg, bool lastSignState
     mSplitter->addWidget(mSnippetSplitter);
 
     QWidget *editorAndCryptoStateIndicators = new QWidget(mSplitter);
-    mCryptoStateIndicatorWidget = new CryptoStateIndicatorWidget;
+    mCryptoStateIndicatorWidget = new CryptoStateIndicatorWidget(this);
     mCryptoStateIndicatorWidget->setShowAlwaysIndicator(KMailSettings::self()->showCryptoLabelIndicator());
 
     QVBoxLayout *vbox = new QVBoxLayout(editorAndCryptoStateIndicators);
@@ -824,7 +824,6 @@ void KMComposerWin::rethinkFields(bool fromSlot, bool forceAllHeaders)
 
     QWidget *prevFocus = mEdtFrom;
 
-
     mGrid->addWidget(mComposerBase->recipientsEditor(), row, 0, 1, 2);
     ++row;
     connect(mEdtFrom, &MessageComposer::ComposerLineEdit::focusDown, mComposerBase->recipientsEditor(), &KPIM::MultiplyingLineEditor::setFocusTop);
diff --git a/src/job/composenewmessagejob.cpp b/src/job/composenewmessagejob.cpp
index ff08bd319..a14ef2b59 100644
--- a/src/job/composenewmessagejob.cpp
+++ b/src/job/composenewmessagejob.cpp
@@ -46,7 +46,7 @@ void ComposeNewMessageJob::start()
 
     mIdentity = mFolder ? mFolder->identity() : 0;
     MessageHelper::initHeader(mMsg, KMKernel::self()->identityManager(), mIdentity);
-    TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage);
+    TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage, this);
     connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &ComposeNewMessageJob::slotOpenComposer);
     parser->setIdentityManager(KMKernel::self()->identityManager());
     if (mFolder) {
diff --git a/src/job/fillcomposerjob.cpp b/src/job/fillcomposerjob.cpp
index 27797cb04..49d5f0386 100644
--- a/src/job/fillcomposerjob.cpp
+++ b/src/job/fillcomposerjob.cpp
@@ -63,7 +63,7 @@ void FillComposerJob::start()
         mMsg->setBody(mSettings.mBody.toUtf8());
         slotOpenComposer();
     } else {
-        TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage);
+        TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage, this);
         connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &FillComposerJob::slotOpenComposer);
         parser->setIdentityManager(KMKernel::self()->identityManager());
         parser->process(KMime::Message::Ptr());
diff --git a/src/job/handleclickedurljob.cpp b/src/job/handleclickedurljob.cpp
index 060bc53e4..43914c6c3 100644
--- a/src/job/handleclickedurljob.cpp
+++ b/src/job/handleclickedurljob.cpp
@@ -70,7 +70,7 @@ void HandleClickedUrlJob::start()
         //TODO
     }
 
-    TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage);
+    TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage, this);
     connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &HandleClickedUrlJob::slotOpenComposer);
     parser->setIdentityManager(KMKernel::self()->identityManager());
     parser->process(mMsg, mCurrentCollection.id());
diff --git a/src/job/newmessagejob.cpp b/src/job/newmessagejob.cpp
index c3ad4ba50..1f72d0de4 100644
--- a/src/job/newmessagejob.cpp
+++ b/src/job/newmessagejob.cpp
@@ -56,7 +56,7 @@ void NewMessageJob::start()
     mMsg->assemble();
 
     mCollection = mNewMessageJobSettings.mCurrentCollection;
-    TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage);
+    TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage, this);
     connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &NewMessageJob::slotOpenComposer);
     parser->setIdentityManager(KMKernel::self()->identityManager());
     parser->process(mMsg, mCollection.id());
diff --git a/src/job/opencomposerhiddenjob.cpp b/src/job/opencomposerhiddenjob.cpp
index 5126c4233..f8e25eb29 100644
--- a/src/job/opencomposerhiddenjob.cpp
+++ b/src/job/opencomposerhiddenjob.cpp
@@ -58,7 +58,7 @@ void OpenComposerHiddenJob::start()
         mMsg->setBody(mSettings.mBody.toUtf8());
         slotOpenComposer();
     } else {
-        TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage);
+        TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage, this);
         connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &OpenComposerHiddenJob::slotOpenComposer);
         parser->setIdentityManager(KMKernel::self()->identityManager());
         parser->process(KMime::Message::Ptr());
diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
index e1e82ce56..d35cc9bda 100644
--- a/src/kmmainwidget.cpp
+++ b/src/kmmainwidget.cpp
@@ -4666,8 +4666,8 @@ void KMMainWidget::slotChangeDisplayMessageFormat(MessageViewer::Viewer::Display
     mFolderDisplayFormatPreference = format;
 
     //Update mPrefererHtmlLoadExtAction
-    const bool useHtml = (mFolderDisplayFormatPreference == MessageViewer::Viewer::Html ||
-                          (mHtmlGlobalSetting && mFolderDisplayFormatPreference == MessageViewer::Viewer::UseGlobalSetting));
+    const bool useHtml = (mFolderDisplayFormatPreference == MessageViewer::Viewer::Html
+                          || (mHtmlGlobalSetting && mFolderDisplayFormatPreference == MessageViewer::Viewer::UseGlobalSetting));
     mPreferHtmlLoadExtAction->setEnabled(useHtml);
 
     if (mMsgView) {
@@ -4840,9 +4840,9 @@ void KMMainWidget::setupUnifiedMailboxChecker()
                          }
 
                          const auto answer = KMessageBox::questionYesNo(
-                             this, i18n("You have more than one email account set up. Do you want to enable the Unified Mailbox feature to "
+                             this, i18n("You have more than one email account set up.\nDo you want to enable the Unified Mailbox feature to "
                                         "show unified content of your inbox, sent and drafts folders?\n"
-                                        "You can configure unified mailboxes, create custom ones or disable the feature completely in KMail's Plugin settings."),
+                                        "You can configure unified mailboxes, create custom ones or\ndisable the feature completely in KMail's Plugin settings."),
                              i18n("Enable Unified Mailboxes?"),
                              KGuiItem(i18n("Enable Unified Mailboxes"), QStringLiteral("dialog-ok")),
                              KGuiItem(i18n("Cancel"), QStringLiteral("dialog-cancel")));