diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index cfc1e9bb6..b794e3328 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -230,6 +230,8 @@ K_GLOBAL_STATIC( KMMainWidget::PtrList, theMainWidgetList )
   mCustomTemplateMenus = 0;
   mCollectionFolderView = new FolderSelectionTreeView( this, mGUIClient );
 
+  connect( mCollectionFolderView->folderTreeView(), SIGNAL( currentChanged( const Akonadi::Collection &) ), this, SLOT( slotFolderChanged( const Akonadi::Collection& ) ) );
+
   CollectionPropertiesDialog::registerPage( new CollectionGeneralPageFactory() );
   CollectionPropertiesDialog::registerPage( new CollectionTemplatesPageFactory() );
   CollectionPropertiesDialog::registerPage( new CollectionMaintenancePageFactory() );
@@ -324,6 +326,12 @@ void KMMainWidget::destruct()
 }
 
 
+void KMMainWidget::slotFolderChanged( const Akonadi::Collection& col)
+{
+  kDebug()<<" active col :"<<col;
+  mCurrentFolder = col;
+}
+
 //-----------------------------------------------------------------------------
 void KMMainWidget::readPreConfig()
 {
@@ -2902,15 +2910,6 @@ void KMMainWidget::folderSelected()
 #endif
 }
 
-void KMMainWidget::slotMessageListViewCurrentFolderChanged( KMFolder * fld )
-{
-  if ( fld == mFolder )
-    return;
-#ifdef OLD_FOLDERVIEW
-  mMainFolderView->setCurrentFolder( fld );
-#endif
-}
-
 //-----------------------------------------------------------------------------
 void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread, bool preferNewTabForOpening )
 {
diff --git a/kmmainwidget.h b/kmmainwidget.h
index 000191dfa..7fef12117 100644
--- a/kmmainwidget.h
+++ b/kmmainwidget.h
@@ -616,7 +616,8 @@ class KMAIL_EXPORT KMMainWidget : public QWidget
     void slotCopyMessagesCompleted( KMCommand *command );
 
     void slotRequestFullSearchFromQuickSearch();
-    void slotMessageListViewCurrentFolderChanged( KMFolder * fld );
+  void slotFolderChanged( const Akonadi::Collection& );
+
     void slotMessageStatusChangeRequest( KMMsgBase *msg, const KPIM::MessageStatus &set, const KPIM::MessageStatus & clear );
   void slotMessageSelected(Akonadi::Item);
 private:
@@ -653,6 +654,7 @@ private:
     KToggleAction *mWatchThreadAction, *mIgnoreThreadAction;
 
   Akonadi::FavoriteCollectionsView *mFavoriteCollectionsView;
+  //Remove it
     QPointer<KMFolder> mFolder;
     QWidget      *mSearchAndTree;
     KTreeWidgetSearchLine *mFolderQuickSearch;
@@ -720,6 +722,8 @@ private:
     KMail::MessageActions *mMsgActions;
   Akonadi::StandardActionManager *mAkonadiStandardActionManager;
   MessageList::Pane *mMessagePane;
+  Akonadi::Collection mCurrentFolder;
+
   FolderSelectionTreeView *mCollectionFolderView;
     bool mOpenedImapFolder;