diff --git a/configuredialog.cpp b/configuredialog.cpp
index 40941939b..6f56dcbeb 100644
--- a/configuredialog.cpp
+++ b/configuredialog.cpp
@@ -162,7 +162,7 @@ namespace {
       w->setEnabled( false );
       w->setToolTip( i18n( lockedDownWarning ) );
     } else {
-      QToolTip::remove( w );
+	  w->setToolTip("");
     }
   }
 
diff --git a/kmsystemtray.cpp b/kmsystemtray.cpp
index 04a6cc4c7..e58d69c75 100644
--- a/kmsystemtray.cpp
+++ b/kmsystemtray.cpp
@@ -545,7 +545,6 @@ void KMSystemTray::updateNewMessages()
   updateCount();
 
   /** Update tooltip to reflect count of unread messages */
-  QToolTip::remove(this);
   this->setToolTip( mCount == 0 ?
 		      i18n("There are no unread messages")
 		      : i18n("There is 1 unread message.",