diff --git a/folderselectiontreeview.cpp b/folderselectiontreeview.cpp
index c9bc70818..c1a4570c5 100644
--- a/folderselectiontreeview.cpp
+++ b/folderselectiontreeview.cpp
@@ -109,6 +109,11 @@ FolderSelectionTreeView::~FolderSelectionTreeView()
 }
 
 
+void FolderSelectionTreeView::disableContextMenuAndExtraColumn()
+{
+  d->collectionFolderView->disableContextMenuAndExtraColumn();
+}
+
 void FolderSelectionTreeView::selectCollectionFolder( const Akonadi::Collection & col )
 {
   kDebug() << "AKONADI PORT: Bug in this code  " << Q_FUNC_INFO;
diff --git a/folderselectiontreeview.h b/folderselectiontreeview.h
index e7587c783..8b9a1d460 100644
--- a/folderselectiontreeview.h
+++ b/folderselectiontreeview.h
@@ -74,6 +74,7 @@ public:
   void quotaWarningParameters( const QColor &color, qreal threshold );
   void readQuotaConfig();
 
+  void disableContextMenuAndExtraColumn();
 
   void readConfig();
 private:
diff --git a/folderselectiontreeviewdialog.cpp b/folderselectiontreeviewdialog.cpp
index a103cf6ee..3d547b6f2 100644
--- a/folderselectiontreeviewdialog.cpp
+++ b/folderselectiontreeviewdialog.cpp
@@ -41,6 +41,7 @@ FolderSelectionTreeViewDialog::FolderSelectionTreeViewDialog( QWidget *parent )
   QWidget *widget = mainWidget();
   QVBoxLayout *layout = new QVBoxLayout( widget );
   treeview = new FolderSelectionTreeView( this );
+  treeview->disableContextMenuAndExtraColumn();
   treeview->readableCollectionProxyModel()->setEnabledCheck( true );
   treeview->readableCollectionProxyModel()->setNecessaryRight( Akonadi::Collection::CanCreateCollection );
   layout->addWidget( treeview );
diff --git a/foldertreeview.cpp b/foldertreeview.cpp
index 98271aa62..74a6ac156 100644
--- a/foldertreeview.cpp
+++ b/foldertreeview.cpp
@@ -28,14 +28,14 @@
 #include <KMenu>
 
 FolderTreeView::FolderTreeView(QWidget *parent )
-  : Akonadi::EntityTreeView( parent )
+  : Akonadi::EntityTreeView( parent ), mbDisableContextMenuAndExtraColumn( false )
 {
   init();
 }
 
 
 FolderTreeView::FolderTreeView(KXMLGUIClient *xmlGuiClient, QWidget *parent )
-  :Akonadi::EntityTreeView( xmlGuiClient, parent )
+  :Akonadi::EntityTreeView( xmlGuiClient, parent ), mbDisableContextMenuAndExtraColumn( false )
 {
   init();
 }
@@ -45,6 +45,16 @@ FolderTreeView::~FolderTreeView()
 {
 }
 
+
+void FolderTreeView::disableContextMenuAndExtraColumn()
+{
+  mbDisableContextMenuAndExtraColumn = true;
+  for ( int i = 1; i <header()->count(); ++i )
+  {
+    setColumnHidden( i, true );
+  }
+}
+
 void FolderTreeView::init()
 {
   setIconSize( QSize( 22, 22 ) );
@@ -74,6 +84,9 @@ void FolderTreeView::readConfig()
 
 void FolderTreeView::slotHeaderContextMenuRequested( const QPoint&pnt )
 {
+  if ( mbDisableContextMenuAndExtraColumn )
+    return;
+
   // the menu for the columns
   KMenu menu;
   QAction *act;
diff --git a/foldertreeview.h b/foldertreeview.h
index 28859ed5e..fd316ac4c 100644
--- a/foldertreeview.h
+++ b/foldertreeview.h
@@ -35,6 +35,8 @@ public:
   void selectPrevUnreadFolder( bool confirm = false);
 
 
+  void disableContextMenuAndExtraColumn();
+
   Akonadi::Collection currentFolder();
 protected:
   enum Move { Next = 0, Previous = 1};
@@ -53,6 +55,10 @@ protected slots:
   void slotHeaderContextMenuChangeIconSize( bool );
   void slotHeaderContextMenuChangeHeader( bool );
   void slotHeaderContextMenuChangeToolTipDisplayPolicy( bool );
+
+private:
+  bool mbDisableContextMenuAndExtraColumn;
+
 };