diff --git a/configuredialog.cpp b/configuredialog.cpp
index 1f342083a..1472643ae 100644
--- a/configuredialog.cpp
+++ b/configuredialog.cpp
@@ -2965,7 +2965,7 @@ void ComposerPage::AttachmentsTab::doLoadFromGlobalSettings()
   mMissingAttachmentDetectionCheck->setChecked(
     GlobalSettings::self()->showForgottenAttachmentWarning() );
 
-  QStringList attachWordsList = GlobalSettings::self()->attachmentKeywords();
+  const QStringList attachWordsList = GlobalSettings::self()->attachmentKeywords();
   mAttachWordsListEditor->setStringList( attachWordsList );
 }
 
diff --git a/kmreaderwin.cpp b/kmreaderwin.cpp
index 9cb445e2e..a670d0824 100644
--- a/kmreaderwin.cpp
+++ b/kmreaderwin.cpp
@@ -337,7 +337,7 @@ void KMReaderWin::displayAboutPage()
     QString featuresText =
       i18n("<p>Some of the new features in this release of KMail include "
            "(compared to KMail %1, which is part of KDE Software Compilation %2):</p>\n",
-       QString("1.13"), QString("4.4")); // prior KMail and KDE version
+           QString("1.13"), KDE::versionRelease() ); // prior KMail and KDE version
     featuresText += "<ul>\n";
     for ( int i = 0 ; i < numKMailNewFeatures ; i++ )
       featuresText += "<li>" + i18n( kmailNewFeatures[i] ) + "</li>\n";
diff --git a/kmsystemtray.cpp b/kmsystemtray.cpp
index cf47c90bd..4d8461b40 100644
--- a/kmsystemtray.cpp
+++ b/kmsystemtray.cpp
@@ -387,7 +387,7 @@ void KMSystemTray::unreadMail( const QAbstractItemModel *model, const QModelInde
     if ( KMail::Util::isVirtualCollection( collection ) )
       continue;
 
-    Akonadi::CollectionStatistics statistics = collection.statistics();
+    const Akonadi::CollectionStatistics statistics = collection.statistics();
     const qint64 count = qMax( 0LL, statistics.unreadCount() );
 
     if ( count > 0 ) {