diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d9d0c7be..276ec83d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,19 +42,19 @@ endif()
 set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
 
-set(AKONADI_MIMELIB_VERSION "5.9.80")
-set(AKONADI_CONTACT_VERSION "5.9.80")
-set(KCONTACTS_LIB_VERSION "5.9.80")
-set(KCALENDARCORE_LIB_VERSION "5.9.80")
-set(CALENDARUTILS_LIB_VERSION "5.9.80")
-set(IDENTITYMANAGEMENT_LIB_VERSION "5.9.80")
-set(KLDAP_LIB_VERSION "5.9.80")
-set(KMAILTRANSPORT_LIB_VERSION "5.9.80")
-set(KONTACTINTERFACE_LIB_VERSION "5.9.80")
-set(KMIME_LIB_VERSION "5.9.80")
-set(KPIMTEXTEDIT_LIB_VERSION "5.9.80")
-set(AKONADI_VERSION "5.9.80")
-set(KTNEF_LIB_VERSION "5.9.80")
+set(AKONADI_MIMELIB_VERSION "5.9.90")
+set(AKONADI_CONTACT_VERSION "5.9.90")
+set(KCONTACTS_LIB_VERSION "5.9.90")
+set(KCALENDARCORE_LIB_VERSION "5.9.90")
+set(CALENDARUTILS_LIB_VERSION "5.9.90")
+set(IDENTITYMANAGEMENT_LIB_VERSION "5.9.90")
+set(KLDAP_LIB_VERSION "5.9.90")
+set(KMAILTRANSPORT_LIB_VERSION "5.9.90")
+set(KONTACTINTERFACE_LIB_VERSION "5.9.90")
+set(KMIME_LIB_VERSION "5.9.90")
+set(KPIMTEXTEDIT_LIB_VERSION "5.9.90")
+set(AKONADI_VERSION "5.9.90")
+set(KTNEF_LIB_VERSION "5.9.90")
 
 set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
 set(KDEPIM_LIB_SOVERSION "5")
@@ -63,18 +63,18 @@ set(QT_REQUIRED_VERSION "5.9.0")
 option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
 
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets)
-set(LIBGRAVATAR_VERSION_LIB "5.9.80")
-set(MAILCOMMON_LIB_VERSION_LIB "5.9.80")
-set(KDEPIM_APPS_LIB_VERSION_LIB "5.9.80")
-set(MESSAGELIB_LIB_VERSION_LIB "5.9.80")
-set(LIBKLEO_LIB_VERSION_LIB "5.9.80")
-set(PIMCOMMON_LIB_VERSION_LIB "5.9.80")
-set(LIBKDEPIM_LIB_VERSION_LIB "5.9.80")
-set(LIBKSIEVE_LIB_VERSION_LIB "5.9.80")
+set(LIBGRAVATAR_VERSION_LIB "5.9.90")
+set(MAILCOMMON_LIB_VERSION_LIB "5.9.90")
+set(KDEPIM_APPS_LIB_VERSION_LIB "5.9.90")
+set(MESSAGELIB_LIB_VERSION_LIB "5.9.90")
+set(LIBKLEO_LIB_VERSION_LIB "5.9.90")
+set(PIMCOMMON_LIB_VERSION_LIB "5.9.90")
+set(LIBKDEPIM_LIB_VERSION_LIB "5.9.90")
+set(LIBKSIEVE_LIB_VERSION_LIB "5.9.90")
 
 find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
 
-find_package(KF5AkonadiSearch "5.9.80" CONFIG REQUIRED)
+find_package(KF5AkonadiSearch "5.9.90" CONFIG REQUIRED)
 set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
 
 set(GPGMEPP_LIB_VERSION "1.8.0")
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 c9f95b123..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);
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());