diff --git a/src/kmmainwin.cpp b/src/kmmainwin.cpp
index eaf94e638..ce3b042f3 100644
--- a/src/kmmainwin.cpp
+++ b/src/kmmainwin.cpp
@@ -1,223 +1,227 @@
 /*
  * kmail: KDE mail client
  * Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
 #include "kmmainwin.h"
 #include "kmmainwidget.h"
 #include <Libkdepim/ProgressStatusBarWidget>
 #include <Libkdepim/StatusbarProgressWidget>
 #include "libkdepim/broadcaststatus.h"
 #include "util.h"
 #include "tag/tagactionmanager.h"
 
 #include <QTimer>
 #include <QStatusBar>
 #include <QApplication>
 
 #include <KConfigGui>
 #include <QMenuBar>
 #include <KConfigGui>
 #include <KLocalizedString>
 #include <kedittoolbar.h>
 #include <kconfig.h>
 #include <kmessagebox.h>
 #include <kxmlguifactory.h>
 #include <kstringhandler.h>
 #include <kstandardaction.h>
 #include "kmail_debug.h"
 #include <ktip.h>
 
 #include <QLabel>
 
 KMMainWin::KMMainWin(QWidget *)
     : KXmlGuiWindow(nullptr)
 {
     setObjectName(QStringLiteral("kmail-mainwindow#"));
     // Set this to be the group leader for all subdialogs - this means
     // modal subdialogs will only affect this dialog, not the other windows
     setAttribute(Qt::WA_GroupLeader);
 
     resize(700, 500);   // The default size
 
     mKMMainWidget = new KMMainWidget(this, this, actionCollection());
     connect(mKMMainWidget, &KMMainWidget::recreateGui, this, &KMMainWin::slotUpdateGui);
     setCentralWidget(mKMMainWidget);
     setupStatusBar();
     if (!kmkernel->xmlGuiInstanceName().isEmpty()) {
         setComponentName(kmkernel->xmlGuiInstanceName(), i18n("KMail2"));
     }
     setStandardToolBarMenuEnabled(true);
 
     KStandardAction::configureToolbars(this, &KMMainWin::slotEditToolbars,
                                        actionCollection());
 
     KStandardAction::keyBindings(this, &KMMainWin::slotConfigureShortcuts,
                                  actionCollection());
 
     mHideMenuBarAction = KStandardAction::showMenubar(this, &KMMainWin::slotToggleMenubar, actionCollection());
 
     KStandardAction::quit(this, &KMMainWin::slotQuit, actionCollection());
     createGUI(QStringLiteral("kmmainwin.rc"));
 
     //must be after createGUI, otherwise e.g toolbar settings are not loaded
     applyMainWindowSettings(KMKernel::self()->config()->group("Main Window"));
 
     connect(KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::statusMsg,
             this, &KMMainWin::displayStatusMessage);
 
     connect(mKMMainWidget, &KMMainWidget::captionChangeRequest,
             this, QOverload<const QString &>::of(&KMainWindow::setCaption));
 
     mKMMainWidget->updateQuickSearchLineText();
     mHideMenuBarAction->setChecked(KMailSettings::self()->showMenuBar());
     slotToggleMenubar(true);
 }
 
 KMMainWin::~KMMainWin()
 {
+    // Avoids a crash if there are any Akonadi jobs running, which may
+    // attempt to display a status message when they are killed.
+    disconnect(KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::statusMsg, this, nullptr);
+
     KConfigGroup grp(KMKernel::self()->config()->group("Main Window"));
     saveMainWindowSettings(grp);
     KMKernel::self()->config()->sync();
 }
 
 KMMainWidget *KMMainWin::mainKMWidget() const
 {
     return mKMMainWidget;
 }
 
 void KMMainWin::displayStatusMessage(const QString &aText)
 {
     if (!statusBar() || !mProgressBar->littleProgress()) {
         return;
     }
     const int statusWidth = statusBar()->width() - mProgressBar->littleProgress()->width()
                             - fontMetrics().maxWidth();
 
     const QString text = fontMetrics().elidedText(QLatin1Char(' ') + aText, Qt::ElideRight,
                                                   statusWidth);
 
     // ### FIXME: We should disable richtext/HTML (to avoid possible denial of service attacks),
     // but this code would double the size of the status bar if the user hovers
     // over an <foo@bar.com>-style email address :-(
     //  text.replace("&", "&amp;");
     //  text.replace("<", "&lt;");
     //  text.replace(">", "&gt;");
     mMessageLabel->setText(text);
     mMessageLabel->setToolTip(aText);
 }
 
 void KMMainWin::slotToggleMenubar(bool dontShowWarning)
 {
     if (menuBar()) {
         if (mHideMenuBarAction->isChecked()) {
             menuBar()->show();
         } else {
             if (!dontShowWarning) {
                 const QString accel = mHideMenuBarAction->shortcut().toString();
                 KMessageBox::information(this,
                                          i18n("<qt>This will hide the menu bar completely."
                                               " You can show it again by typing %1.</qt>", accel),
                                          i18n("Hide menu bar"), QStringLiteral("HideMenuBarWarning"));
             }
             menuBar()->hide();
         }
         KMailSettings::self()->setShowMenuBar(mHideMenuBarAction->isChecked());
     }
 }
 
 void KMMainWin::slotEditToolbars()
 {
     KConfigGroup grp = KMKernel::self()->config()->group("Main Window");
     saveMainWindowSettings(grp);
     QPointer<KEditToolBar> dlg = new KEditToolBar(guiFactory(), this);
     connect(dlg.data(), &KEditToolBar::newToolBarConfig, this, &KMMainWin::slotUpdateGui);
 
     dlg->exec();
     delete dlg;
 }
 
 void KMMainWin::slotUpdateGui()
 {
     // remove dynamically created actions before editing
     mKMMainWidget->clearFilterActions();
     mKMMainWidget->tagActionManager()->clearActions();
 
     createGUI(QStringLiteral("kmmainwin.rc"));
     applyMainWindowSettings(KMKernel::self()->config()->group("Main Window"));
 
     // plug dynamically created actions again
     mKMMainWidget->initializeFilterActions();
     mKMMainWidget->tagActionManager()->createActions();
     mKMMainWidget->initializePluginActions();
 }
 
 void KMMainWin::setupStatusBar()
 {
     /* Create a progress dialog and hide it. */
     mProgressBar = new KPIM::ProgressStatusBarWidget(statusBar(), this);
     mMessageLabel = new QLabel(i18n("Starting..."));
     mMessageLabel->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
     statusBar()->addWidget(mMessageLabel);
 
     QTimer::singleShot(2000, KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::reset);
 
     statusBar()->addPermanentWidget(mKMMainWidget->vacationScriptIndicator());
     statusBar()->addPermanentWidget(mProgressBar->littleProgress());
 }
 
 void KMMainWin::slotQuit()
 {
     mReallyClose = true;
     close();
 }
 
 //-----------------------------------------------------------------------------
 bool KMMainWin::restoreDockedState(int n)
 {
     // Default restore behavior is to show the window once it is restored.
     // Override this if the main window was hidden in the system tray
     // when the session was saved.
     KConfigGroup config(KConfigGui::sessionConfig(), QString::number(n));
     bool show = !config.readEntry("docked", false);
 
     return KMainWindow::restore(n, show);
 }
 
 void KMMainWin::saveProperties(KConfigGroup &config)
 {
     // This is called by the session manager on log-off
     // Save the shown/hidden status so we can restore to the same state.
     KMainWindow::saveProperties(config);
     config.writeEntry("docked", isHidden());
 }
 
 bool KMMainWin::queryClose()
 {
     if (kmkernel->shuttingDown() || qApp->isSavingSession() || mReallyClose) {
         return true;
     }
     return kmkernel->canQueryClose();
 }
 
 void KMMainWin::slotConfigureShortcuts()
 {
     if (guiFactory()->configureShortcuts()) {
         mKMMainWidget->updateQuickSearchLineText();
     }
 }