diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index 2817ae03d..431968f76 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -1180,8 +1180,9 @@ void KMMainWidget::slotCollectionChanged( const Akonadi::Collection&collection,
        && ( collection == mCurrentFolder->collection() )
        && set.contains( "MESSAGEFOLDER" ) ) {
     mMessagePane->resetModelStorage();
+  } else if ( set.contains( "ENTITYDISPLAY" ) || set.contains( "NAME" ) ) {
+    mMessagePane->updateTabIconText( collection );
   }
-  //TODO update tab name/tab icons when collection changes
 }