diff --git a/kmkernel.cpp b/kmkernel.cpp
index 37efdcdff..47a76d125 100644
--- a/kmkernel.cpp
+++ b/kmkernel.cpp
@@ -540,7 +540,7 @@ void KMKernel::checkMail () //might create a new reader but won't show!!
 void KMKernel::setSystrayUnreadCountEnabled(bool enabled)
 {
     GlobalSettings::self()->systemTrayShowUnreadItem()->setValue(enabled);
-    mSystemTray->setShowUnread(enabled);
+    mSystemTray->setShowUnreadCount(enabled);
     GlobalSettings::self()->writeConfig();
 }
 
@@ -2096,7 +2096,7 @@ void KMKernel::toggleSystemTray()
     // Set mode of systemtray. If mode has changed, tray will handle this.
     if ( mSystemTray ) {
       mSystemTray->setMode( GlobalSettings::self()->systemTrayPolicy() );
-      mSystemTray->setShowUnread( GlobalSettings::self()->systemTrayShowUnread() );
+      mSystemTray->setShowUnreadCount( GlobalSettings::self()->systemTrayShowUnread() );
     }
 
   }
diff --git a/kmsystemtray.cpp b/kmsystemtray.cpp
index fb6959288..5a51f7f12 100644
--- a/kmsystemtray.cpp
+++ b/kmsystemtray.cpp
@@ -62,7 +62,7 @@ KMSystemTray::KMSystemTray(QObject *parent)
       mDesktopOfMainWin( 0 ),
       mMode( GlobalSettings::EnumSystemTrayPolicy::ShowOnUnread ),
       mCount( 0 ),
-      mShowUnreadMail( true ),
+      mShowUnreadMailCount( true ),
       mNewMessagesPopup( 0 ),
       mSendQueued( 0 )
 {
@@ -142,11 +142,11 @@ KMSystemTray::~KMSystemTray()
 {
 }
 
-void KMSystemTray::setShowUnread(bool showUnread)
+void KMSystemTray::setShowUnreadCount(bool showUnreadCount)
 {
-    if (mShowUnreadMail == showUnread)
+    if (mShowUnreadMailCount == showUnreadCount)
         return;
-    mShowUnreadMail = showUnread;
+    mShowUnreadMailCount = showUnreadCount;
     updateSystemTray();
 }
 
@@ -186,7 +186,7 @@ void KMSystemTray::updateCount()
         setIconByName( "kmail" );
         return;
     }
-    if (mShowUnreadMail) {
+    if (mShowUnreadMailCount) {
         const int overlaySize = KIconLoader::SizeSmallMedium;
 
         const QString countString = QString::number( mCount );
diff --git a/kmsystemtray.h b/kmsystemtray.h
index 6373d981d..4dd390b60 100644
--- a/kmsystemtray.h
+++ b/kmsystemtray.h
@@ -47,7 +47,7 @@ public:
     /** destructor */
     ~KMSystemTray();
 
-    void setShowUnread(bool showUnread);
+    void setShowUnreadCount(bool showUnreadCount);
     void setMode(int mode);
     int mode() const;
 
@@ -80,7 +80,7 @@ private:
     int mMode;
     int mCount;
 
-    bool mShowUnreadMail;
+    bool mShowUnreadMailCount;
     QMenu *mNewMessagesPopup;
     QAction *mSendQueued;
 };