diff --git a/aboutdata.cpp b/aboutdata.cpp
index 75c1ba42f..4afc8b26a 100644
--- a/aboutdata.cpp
+++ b/aboutdata.cpp
@@ -114,7 +114,7 @@ namespace KMail {
       "glaurent@telegraph-road.org", 0 },
     { "Sam Magnuson", 0,
       "sam@trolltech.com", 0 },
-    { "Laurent Montel", 0,
+    { "Laurent Montel", I18N_NOOP( "Akonadi porting" ),
       "montel@kde.org", 0 },
     { "Matt Newell", 0,
       "newellm@proaxis.com", 0 },
diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index 083721091..65b4e4a1b 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -227,10 +227,7 @@ K_GLOBAL_STATIC( KMMainWidget::PtrList, theMainWidgetList )
   mGUIClient = aGUIClient;
   mOpenedImapFolder = false;
   mCustomTemplateMenus = 0;
-  mCollectionFolderView = new FolderSelectionTreeView( this, mGUIClient );
-
-  connect( mCollectionFolderView->folderTreeView(), SIGNAL( currentChanged( const Akonadi::Collection &) ), this, SLOT( slotFolderChanged( const Akonadi::Collection& ) ) );
-  connect( mCollectionFolderView->monitorFolders(), SIGNAL( collectionRemoved( const Akonadi::Collection &) ), this, SLOT( slotCollectionRemoved( const Akonadi::Collection& ) ) );
+  mCollectionFolderView = 0;
 
   CollectionPropertiesDialog::useDefaultPage( false );
   CollectionPropertiesDialog::registerPage( new CollectionGeneralPageFactory() );
@@ -877,6 +874,10 @@ void KMMainWidget::createWidgets()
   //
   // Create header view and search bar
   //
+  mCollectionFolderView = new FolderSelectionTreeView( this, mGUIClient );
+
+  connect( mCollectionFolderView->folderTreeView(), SIGNAL( currentChanged( const Akonadi::Collection &) ), this, SLOT( slotFolderChanged( const Akonadi::Collection& ) ) );
+  connect( mCollectionFolderView->monitorFolders(), SIGNAL( collectionRemoved( const Akonadi::Collection &) ), this, SLOT( slotCollectionRemoved( const Akonadi::Collection& ) ) );
 
   mCollectionFolderView->setSelectionMode( QAbstractItemView::ExtendedSelection );
   const KConfigGroup cfg( KGlobal::config(), "CollectionFolderView" );