diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index f2d402b9c7cb0461b33148fc87f2294a79aa9028..752b2b8436dcb35cfa7a25b0978c5c1e84a12360 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -420,7 +420,7 @@ void KMMainWidget::slotUpdateActionsAfterMailChecking()
             GlobalSettings::self()->sendOnCheck() == GlobalSettings::EnumSendOnCheck::SendOnAllChecks;
     const bool sendOnManual =
             GlobalSettings::self()->sendOnCheck() == GlobalSettings::EnumSendOnCheck::SendOnManualChecks;
-    if ( !kmkernel->isOffline() && ( sendOnAll || (sendOnManual /*&& sendOnCheck*/ ) ) ) {
+    if ( !kmkernel->isOffline() && ( sendOnAll || sendOnManual ) ) {
         slotSendQueued();
     }
     // update folder menus in case some mail got filtered to trash/current folder
diff --git a/kmail/secondarywindow.cpp b/kmail/secondarywindow.cpp
index 87f7c5d661f47a858e256b1fdf1842a08115bd63..29177ba020a575e1a5872788d620876765503d47 100644
--- a/kmail/secondarywindow.cpp
+++ b/kmail/secondarywindow.cpp
@@ -79,7 +79,7 @@ void SecondaryWindow::closeEvent( QCloseEvent * e )
 
 void SecondaryWindow::setCaption( const QString &userCaption )
 {
-    QString caption = KGlobal::caption();
+    const QString caption = KGlobal::caption();
     QString captionString = userCaption.isEmpty() ? caption : userCaption;
     if ( !userCaption.isEmpty() ) {
         // Add the application name if: