diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index b6655c53c6..db3137ddfa 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -1,4863 +1,4864 @@
 /* -*- mode: C++; c-file-style: "gnu" -*-
   This file is part of KMail, the KDE mail client.
   Copyright (c) 2002 Don Sanders <sanders@kde.org>
   Copyright (c) 2009, 2010, 2011, 2012 Montel Laurent <montel@kde.org>
 
   Based on the work of Stefan Taferner <taferner@kde.org>
 
   KMail is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License, version 2, as
   published by the Free Software Foundation.
 
   KMail is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License along
   with this program; if not, write to the Free Software Foundation, Inc.,
   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 // KMail includes
 #include "kmreadermainwin.h"
 #include "editor/composer.h"
 #include "searchdialog/searchwindow.h"
 #include "antispam-virus/antispamwizard.h"
 #include "widgets/vacationscriptindicatorwidget.h"
 #include "undostack.h"
 #include "kmcommands.h"
 #include "kmmainwin.h"
 #include "kmsystemtray.h"
 #include "customtemplatesmenu.h"
 #include "folderselectiondialog.h"
 #include "foldertreewidget.h"
 #include "util.h"
 #include "util/mailutil.h"
 #include "kernel/mailkernel.h"
 #include "dialog/archivefolderdialog.h"
 #include "settings/globalsettings.h"
 #include "foldertreeview.h"
 #include "tag/tagactionmanager.h"
 #include "foldershortcutactionmanager.h"
 #include "widgets/collectionpane.h"
 #if !defined(NDEBUG)
 #include <ksieveui/debug/sievedebugdialog.h>
 using KSieveUi::SieveDebugDialog;
 #endif
 
 #include "collectionpage/collectionmaintenancepage.h"
 #include "collectionpage/collectionquotapage.h"
 #include "collectionpage/collectiontemplatespage.h"
 #include "collectionpage/collectionshortcutpage.h"
 #include "collectionpage/collectionviewpage.h"
 #include "collectionpage/collectionmailinglistpage.h"
 #include "tag/tagselectdialog.h"
 #include "archivemailagentinterface.h"
 #include "job/createnewcontactjob.h"
 #include "sendlateragentinterface.h"
 #include "folderarchive/folderarchiveutil.h"
 #include "folderarchive/folderarchivemanager.h"
 
 #include "pimcommon/acl/collectionaclpage.h"
 #include "mailcommon/collectionpage/collectiongeneralpage.h"
 #include "mailcommon/collectionpage/collectionexpirypage.h"
 #include "mailcommon/collectionpage/expirecollectionattribute.h"
 #include "mailcommon/filter/filtermanager.h"
 #include "mailcommon/filter/mailfilter.h"
 #include "mailcommon/widgets/favoritecollectionwidget.h"
 #include "mailcommon/folder/foldertreewidget.h"
 #include "mailcommon/folder/foldertreeview.h"
 #include "mailcommon/mailcommonsettings_base.h"
 #include "kmmainwidget.h"
 
 // Other PIM includes
 #include "kdepim-version.h"
 
 #include "messageviewer/utils/autoqpointer.h"
 #include "messageviewer/settings/globalsettings.h"
 #include "messageviewer/viewer/viewer.h"
 #include "messageviewer/viewer/attachmentstrategy.h"
 #include "messageviewer/header/headerstrategy.h"
 #include "messageviewer/header/headerstyle.h"
 #ifndef QT_NO_CURSOR
 #include "messageviewer/utils/kcursorsaver.h"
 #endif
 
 #include "messagecomposer/sender/messagesender.h"
 #include "messagecomposer/helper/messagehelper.h"
 
 #include "templateparser/templateparser.h"
 
 #include "messagecore/settings/globalsettings.h"
 #include "messagecore/misc/mailinglist.h"
 #include "messagecore/helpers/messagehelpers.h"
 
 #include "dialog/kmknotify.h"
 
 #include "ksieveui/vacation/vacationmanager.h"
 
 
 // LIBKDEPIM includes
 #include "progresswidget/progressmanager.h"
 #include "misc/broadcaststatus.h"
 
 // KDEPIMLIBS includes
 #include <Akonadi/AgentManager>
 #include <Akonadi/AttributeFactory>
 #include <akonadi/itemfetchjob.h>
 #include <akonadi/collectionattributessynchronizationjob.h>
 #include <akonadi/collectionfetchjob.h>
 #include <akonadi/collectionfetchscope.h>
 #include <akonadi/contact/contactsearchjob.h>
 #include <akonadi/collectionpropertiesdialog.h>
 #include <akonadi/entitydisplayattribute.h>
 #include <akonadi/entitylistview.h>
 #include <akonadi/etmviewstatesaver.h>
 #include <akonadi/agentinstance.h>
 #include <akonadi/agenttype.h>
 #include <akonadi/changerecorder.h>
 #include <akonadi/session.h>
 #include <akonadi/entitytreemodel.h>
 #include <akonadi/favoritecollectionsmodel.h>
 #include <akonadi/itemfetchscope.h>
 #include <akonadi/itemmodifyjob.h>
 #include <akonadi/control.h>
 #include <akonadi/collectiondialog.h>
 #include <akonadi/collectionstatistics.h>
 #include <akonadi/collectionstatisticsdelegate.h>
 #include <Akonadi/EntityMimeTypeFilterModel>
 #include <akonadi/kmime/messageflags.h>
 #include <akonadi/kmime/removeduplicatesjob.h>
 #include <akonadi/collectiondeletejob.h>
 #include <akonadi/dbusconnectionpool.h>
 #include <Akonadi/CachePolicy>
 
 #include <kpimidentities/identity.h>
 #include <kpimidentities/identitymanager.h>
 #include <kpimutils/email.h>
 #include <mailtransport/transportmanager.h>
 #include <mailtransport/transport.h>
 #include <kmime/kmime_mdn.h>
 #include <kmime/kmime_header_parsing.h>
 #include <kmime/kmime_message.h>
 #include <ksieveui/managesievescriptsdialog.h>
 #include <ksieveui/util/util.h>
 
 // KDELIBS includes
 #include <kaboutdata.h>
 #include <kicon.h>
 #include <kwindowsystem.h>
 #include <krun.h>
 #include <kmessagebox.h>
 #include <kactionmenu.h>
 #include <kmenu.h>
 #include <kacceleratormanager.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kstandardshortcut.h>
 #include <kshortcutsdialog.h>
 #include <kcharsets.h>
 #include <kdebug.h>
 #include <kfiledialog.h>
 #include <ktip.h>
 #include <kstandarddirs.h>
 #include <kstandardaction.h>
 #include <ktoggleaction.h>
 #include <knotification.h>
 #include <knotifyconfigwidget.h>
 #include <kstringhandler.h>
 #include <kconfiggroup.h>
 #include <ktoolinvocation.h>
 #include <kxmlguifactory.h>
 #include <kxmlguiclient.h>
 #include <kstatusbar.h>
 #include <kaction.h>
 #include <ktreewidgetsearchline.h>
 #include <Solid/Networking>
 #include <KRecentFilesAction>
 
 // Qt includes
 #include <QByteArray>
 #include <QHeaderView>
 #include <QLabel>
 #include <QList>
 #include <QSplitter>
 #include <QVBoxLayout>
 #include <QShortcut>
 #include <QProcess>
 #include <QDBusMessage>
 #include <QDBusConnection>
 #include <QTextDocument>
 #include <QMenu>
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusReply>
 #include <QDBusPendingCallWatcher>
 
 // System includes
 #include <assert.h>
 #include <errno.h> // ugh
 #include <akonadi/standardactionmanager.h>
 
 
 using namespace KMime;
 using namespace Akonadi;
 using namespace MailCommon;
 using KPIM::ProgressManager;
 using KPIM::BroadcastStatus;
 using KMail::SearchWindow;
 using KMail::AntiSpamWizard;
 using KMime::Types::AddrSpecList;
 using MessageViewer::AttachmentStrategy;
 
 Q_DECLARE_METATYPE(KPIM::ProgressItem*)
 Q_DECLARE_METATYPE(Akonadi::Job*)
 Q_DECLARE_METATYPE(QPointer<KPIM::ProgressItem>)
 K_GLOBAL_STATIC( KMMainWidget::PtrList, theMainWidgetList )
 
 //-----------------------------------------------------------------------------
 KMMainWidget::KMMainWidget( QWidget *parent, KXMLGUIClient *aGUIClient,
                             KActionCollection *actionCollection, KSharedConfig::Ptr config ) :
     QWidget( parent ),
     mMoveMsgToFolderAction(0),
     mCollectionProperties( 0 ),
     mFavoriteCollectionsView( 0 ),
     mMsgView( 0 ),
     mSplitter1( 0 ),
     mSplitter2( 0 ),
     mFolderViewSplitter( 0 ),
     mArchiveFolderAction( 0 ),
     mShowBusySplashTimer( 0 ),
     mMsgActions( 0 ),
     mCurrentFolder( 0 ),
     mVacationIndicatorActive( false ),
     mGoToFirstUnreadMessageInSelectedFolder( false )
 {
     // must be the first line of the constructor:
     mStartupDone = false;
     mWasEverShown = false;
     mReaderWindowActive = true;
     mReaderWindowBelow = true;
     mFolderHtmlPref = false;
     mFolderHtmlLoadExtPref = false;
     mDestructed = false;
     mActionCollection = actionCollection;
     mTopLayout = new QVBoxLayout( this );
     mTopLayout->setMargin( 0 );
     mConfig = config;
     mGUIClient = aGUIClient;
     mFolderTreeWidget = 0;
     mPreferHtmlAction = 0;
     mPreferHtmlLoadExtAction = 0;
     Akonadi::Control::widgetNeedsAkonadi( this );
     mFavoritesModel = 0;
     mVacationManager = new KSieveUi::VacationManager(this);
 
 
     // FIXME This should become a line separator as soon as the API
     // is extended in kdelibs.
     mToolbarActionSeparator = new QAction( this );
     mToolbarActionSeparator->setSeparator( true );
 
     theMainWidgetList->append( this );
 
     readPreConfig();
     createWidgets();
     setupActions();
 
 
     readConfig();
 
     if ( !kmkernel->isOffline() ) { //kmail is set to online mode, make sure the agents are also online
         kmkernel->setAccountStatus(true);
     }
 
 
     QTimer::singleShot( 0, this, SLOT(slotShowStartupFolder()));
 
     connect( kmkernel, SIGNAL(startCheckMail()),
              this, SLOT(slotStartCheckMail()) );
 
     connect( kmkernel, SIGNAL(endCheckMail()),
              this, SLOT(slotEndCheckMail()) );
 
     connect( kmkernel, SIGNAL(configChanged()),
              this, SLOT(slotConfigChanged()) );
 
     connect( kmkernel, SIGNAL(onlineStatusChanged(GlobalSettings::EnumNetworkState::type)),
              this, SLOT(slotUpdateOnlineStatus(GlobalSettings::EnumNetworkState::type)) );
 
     connect( mTagActionManager, SIGNAL(tagActionTriggered(Akonadi::Tag)),
              this, SLOT(slotUpdateMessageTagList(Akonadi::Tag)) );
 
     connect( mTagActionManager, SIGNAL(tagMoreActionClicked()),
              this, SLOT(slotSelectMoreMessageTagList()) );
 
     kmkernel->toggleSystemTray();
 
     { // make sure the pages are registered only once, since there can be multiple instances of KMMainWidget
         static bool pagesRegistered = false;
 
         if ( !pagesRegistered ) {
             Akonadi::CollectionPropertiesDialog::registerPage( new PimCommon::CollectionAclPageFactory );
             Akonadi::CollectionPropertiesDialog::registerPage( new MailCommon::CollectionGeneralPageFactory );
             Akonadi::CollectionPropertiesDialog::registerPage( new CollectionMaintenancePageFactory );
             Akonadi::CollectionPropertiesDialog::registerPage( new CollectionQuotaPageFactory );
             Akonadi::CollectionPropertiesDialog::registerPage( new CollectionTemplatesPageFactory );
             Akonadi::CollectionPropertiesDialog::registerPage( new MailCommon::CollectionExpiryPageFactory );
             Akonadi::CollectionPropertiesDialog::registerPage( new CollectionViewPageFactory );
             Akonadi::CollectionPropertiesDialog::registerPage( new CollectionMailingListPageFactory );
             Akonadi::CollectionPropertiesDialog::registerPage( new CollectionShortcutPageFactory );
 
             pagesRegistered = true;
         }
     }
 
     KMainWindow *mainWin = dynamic_cast<KMainWindow*>(window());
     KStatusBar *sb =  mainWin ? mainWin->statusBar() : 0;
     mVacationScriptIndicator = new KMail::VacationScriptIndicatorWidget( sb );
     mVacationScriptIndicator->hide();
     connect( mVacationScriptIndicator, SIGNAL(clicked(QString)), SLOT(slotEditVacation(QString)) );
     if ( KSieveUi::Util::checkOutOfOfficeOnStartup() )
         QTimer::singleShot( 0, this, SLOT(slotCheckVacation()) );
 
     connect( mFolderTreeWidget->folderTreeView()->model(), SIGNAL(modelReset()),
              this, SLOT(restoreCollectionFolderViewConfig()) );
     restoreCollectionFolderViewConfig();
 
     if ( kmkernel->firstStart() ) {
         if (MailCommon::Util::foundMailer()) {
             if (KMessageBox::questionYesNo(this,i18n("Another mailer was found on system. Do you want to import data from it?")) == KMessageBox::Yes) {
                 const QString path = KStandardDirs::findExe( QLatin1String("importwizard" ) );
                 if ( !QProcess::startDetached( path ) ) {
                     KMessageBox::error( this, i18n( "Could not start the import wizard. "
                                                     "Please check your installation." ),
                                         i18n( "Unable to start import wizard" ) );
                 }
             } else {
                 KMail::Util::launchAccountWizard( this );
             }
         } else {
             KMail::Util::launchAccountWizard( this );
         }
     }
     // must be the last line of the constructor:
     mStartupDone = true;
 
 
     mCheckMailTimer.setInterval( 3 * 1000 );
     mCheckMailTimer.setSingleShot( true );
     connect( &mCheckMailTimer, SIGNAL(timeout()), SLOT(slotUpdateActionsAfterMailChecking()) );
 
 }
 
 void KMMainWidget::restoreCollectionFolderViewConfig()
 {
     ETMViewStateSaver *saver = new ETMViewStateSaver;
     saver->setView( mFolderTreeWidget->folderTreeView() );
     const KConfigGroup cfg( KMKernel::self()->config(), "CollectionFolderView" );
     mFolderTreeWidget->restoreHeaderState( cfg.readEntry( "HeaderState", QByteArray() ) );
     saver->restoreState( cfg );
     //Restore startup folder
 
     Akonadi::Collection::Id id = -1;
     if (mCurrentFolder && mCurrentFolder->collection().isValid() ) {
         id = mCurrentFolder->collection().id();
     }
 
     if (id == -1) {
         if (GlobalSettings::self()->startSpecificFolderAtStartup()) {
             Akonadi::Collection::Id startupFolder = GlobalSettings::self()->startupFolder();
             if ( startupFolder > 0 )
                 saver->restoreCurrentItem( QString::fromLatin1("c%1").arg(startupFolder) );
         }
     } else {
         saver->restoreCurrentItem( QString::fromLatin1("c%1").arg(id) );
     }
 }
 
 
 //-----------------------------------------------------------------------------
 //The kernel may have already been deleted when this method is called,
 //perform all cleanup that requires the kernel in destruct()
 KMMainWidget::~KMMainWidget()
 {
     theMainWidgetList->removeAll( this );
     qDeleteAll( mFilterCommands );
     destruct();
 }
 
 
 //-----------------------------------------------------------------------------
 //This method performs all cleanup that requires the kernel to exist.
 void KMMainWidget::destruct()
 {
     if ( mDestructed )
         return;
     if ( mSearchWin )
         mSearchWin->close();
     writeConfig(false); /* don't force kmkernel sync when close BUG: 289287 */
     writeFolderConfig();
     deleteWidgets();
     mCurrentFolder.clear();
     delete mMoveOrCopyToDialog;
     delete mSelectFromAllFoldersDialog;
 
     disconnect( kmkernel->folderCollectionMonitor(), SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection)), this, 0);
     disconnect( kmkernel->folderCollectionMonitor(), SIGNAL(itemRemoved(Akonadi::Item)), this, 0);
     disconnect( kmkernel->folderCollectionMonitor(), SIGNAL(itemMoved(Akonadi::Item,Akonadi::Collection,Akonadi::Collection)), this, 0);
     disconnect( kmkernel->folderCollectionMonitor(), SIGNAL(collectionChanged(Akonadi::Collection,QSet<QByteArray>)), this, 0);
     disconnect( kmkernel->folderCollectionMonitor(), SIGNAL(collectionStatisticsChanged(Akonadi::Collection::Id,Akonadi::CollectionStatistics)), this, 0);
 
     mDestructed = true;
 }
 
 
 void KMMainWidget::slotStartCheckMail()
 {
     if ( mCheckMailTimer.isActive() )
         mCheckMailTimer.stop();
 }
 
 void KMMainWidget::slotEndCheckMail()
 {
     if ( !mCheckMailTimer.isActive() )
         mCheckMailTimer.start();
 }
 
 void KMMainWidget::slotUpdateActionsAfterMailChecking()
 {
     const bool sendOnAll =
             GlobalSettings::self()->sendOnCheck() == GlobalSettings::EnumSendOnCheck::SendOnAllChecks;
     const bool sendOnManual =
             GlobalSettings::self()->sendOnCheck() == GlobalSettings::EnumSendOnCheck::SendOnManualChecks;
     if ( !kmkernel->isOffline() && ( sendOnAll || (sendOnManual /*&& sendOnCheck*/ ) ) ) {
         slotSendQueued();
     }
     // update folder menus in case some mail got filtered to trash/current folder
     // and we can enable "empty trash/move all to trash" action etc.
     updateFolderMenu();
 }
 
 void KMMainWidget::slotCollectionFetched( int collectionId )
 {
     // Called when a collection is fetched for the first time by the ETM.
     // This is the right time to update the caption (which still says "Loading...")
     // and to update the actions that depend on the number of mails in the folder.
     if ( mCurrentFolder && collectionId == mCurrentFolder->collection().id() ) {
         mCurrentFolder->setCollection( MailCommon::Util::updatedCollection( mCurrentFolder->collection() ) );
         updateMessageActions();
         updateFolderMenu();
     }
     // We call this for any collection, it could be one of our parents...
     if ( mCurrentFolder ) {
         emit captionChangeRequest( MailCommon::Util::fullCollectionPath( mCurrentFolder->collection() ) );
     }
 }
 
 void KMMainWidget::slotFolderChanged( const Akonadi::Collection& collection )
 {
     folderSelected( collection );
     if (collection.cachePolicy().syncOnDemand())
         AgentManager::self()->synchronizeCollection( collection, false );
     mMsgActions->setCurrentMessage( Akonadi::Item() );
     emit captionChangeRequest( MailCommon::Util::fullCollectionPath( collection ) );
 }
 
 void KMMainWidget::folderSelected( const Akonadi::Collection & col )
 {
     // This is connected to the MainFolderView signal triggering when a folder is selected
 
     if ( mGoToFirstUnreadMessageInSelectedFolder )
     {
         // the default action has been overridden from outside
         mPreSelectionMode = MessageList::Core::PreSelectFirstUnreadCentered;
     } else {
         // use the default action
         switch ( GlobalSettings::self()->actionEnterFolder() )
         {
         case GlobalSettings::EnumActionEnterFolder::SelectFirstUnread:
             mPreSelectionMode = MessageList::Core::PreSelectFirstUnreadCentered;
             break;
         case GlobalSettings::EnumActionEnterFolder::SelectLastSelected:
             mPreSelectionMode = MessageList::Core::PreSelectLastSelected;
             break;
         case GlobalSettings::EnumActionEnterFolder::SelectNewest:
             mPreSelectionMode = MessageList::Core::PreSelectNewestCentered;
             break;
         case GlobalSettings::EnumActionEnterFolder::SelectOldest:
             mPreSelectionMode = MessageList::Core::PreSelectOldestCentered;
             break;
         default:
             mPreSelectionMode = MessageList::Core::PreSelectNone;
             break;
         }
     }
 
     mGoToFirstUnreadMessageInSelectedFolder = false;
 #ifndef QT_NO_CURSOR
     MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() );
 #endif
 
     if (mMsgView)
         mMsgView->clear(true);
     const bool newFolder = mCurrentFolder && ( mCurrentFolder->collection() != col );
 
     // Delete any pending timer, if needed it will be recreated below
     delete mShowBusySplashTimer;
     mShowBusySplashTimer = 0;
     if ( newFolder )
     {
         // We're changing folder: write configuration for the old one
         writeFolderConfig();
     }
 
     mCurrentFolder = FolderCollection::forCollection( col );
 
     readFolderConfig();
     if (mMsgView)
     {
         mMsgView->setHtmlOverride(mFolderHtmlPref);
         mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref);
     }
 
     if ( !mCurrentFolder->isValid() && ( mMessagePane->count() < 2 ) )
         slotIntro();
 
     updateMessageActions();
     updateFolderMenu();
 
     // The message pane uses the selection model of the folder view to load the correct aggregation model and theme
     //  settings. At this point the selection model hasn't been updated yet to the user's new choice, so it would load
     //  the old folder settings instead.
     QTimer::singleShot( 0, this, SLOT(slotShowSelectedFolderInPane()) );
 }
 
 void KMMainWidget::slotShowSelectedFolderInPane()
 {
     if ( mCurrentFolder && mCurrentFolder->collection().isValid() ) {
         mMessagePane->setCurrentFolder( mCurrentFolder->collection(), false , mPreSelectionMode );
     }
 }
 
 void KMMainWidget::clearViewer()
 {
     if (mMsgView) {
         mMsgView->clear( true );
         mMsgView->displayAboutPage();
     }
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::readPreConfig()
 {
     mLongFolderList = GlobalSettings::self()->folderList() == GlobalSettings::EnumFolderList::longlist;
     mReaderWindowActive = GlobalSettings::self()->readerWindowMode() != GlobalSettings::EnumReaderWindowMode::hide;
     mReaderWindowBelow = GlobalSettings::self()->readerWindowMode() == GlobalSettings::EnumReaderWindowMode::below;
 
     mHtmlPref = MessageViewer::GlobalSettings::self()->htmlMail();
     mHtmlLoadExtPref = MessageViewer::GlobalSettings::self()->htmlLoadExternal();
     mEnableFavoriteFolderView = ( MailCommon::MailCommonSettings::self()->favoriteCollectionViewMode() != MailCommon::MailCommonSettings::EnumFavoriteCollectionViewMode::HiddenMode );
     mEnableFolderQuickSearch = GlobalSettings::self()->enableFolderQuickSearch();
     updateHtmlMenuEntry();
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::readFolderConfig()
 {
     if ( !mCurrentFolder || !mCurrentFolder->isValid() )
         return;
 
     KSharedConfig::Ptr config = KMKernel::self()->config();
     KConfigGroup group( config, MailCommon::FolderCollection::configGroupName( mCurrentFolder->collection() ) );
     mFolderHtmlPref =
             group.readEntry( "htmlMailOverride", false );
     mFolderHtmlLoadExtPref =
             group.readEntry( "htmlLoadExternalOverride", false );
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::writeFolderConfig()
 {
     if ( mCurrentFolder && mCurrentFolder->isValid() ) {
         KSharedConfig::Ptr config = KMKernel::self()->config();
         KConfigGroup group( config, MailCommon::FolderCollection::configGroupName( mCurrentFolder->collection() ) );
         group.writeEntry( "htmlMailOverride", mFolderHtmlPref );
         group.writeEntry( "htmlLoadExternalOverride", mFolderHtmlLoadExtPref );
     }
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::layoutSplitters()
 {
     // This function can only be called when the old splitters are already deleted
     assert( !mSplitter1 );
     assert( !mSplitter2 );
 
     // For some reason, this is necessary here so that the copy action still
     // works after changing the folder layout.
     if ( mMsgView )
         disconnect( mMsgView->copyAction(), SIGNAL(triggered(bool)),
                     mMsgView, SLOT(slotCopySelectedText()) );
 
     // If long folder list is enabled, the splitters are:
     // Splitter 1: FolderView vs (HeaderAndSearch vs MessageViewer)
     // Splitter 2: HeaderAndSearch vs MessageViewer
     //
     // If long folder list is disabled, the splitters are:
     // Splitter 1: (FolderView vs HeaderAndSearch) vs MessageViewer
     // Splitter 2: FolderView vs HeaderAndSearch
 
     // The folder view is both the folder tree and the favorite folder view, if
     // enabled
 
     const bool opaqueResize = KGlobalSettings::opaqueResize();
     const bool readerWindowAtSide = !mReaderWindowBelow && mReaderWindowActive;
     const bool readerWindowBelow = mReaderWindowBelow && mReaderWindowActive;
 
     mSplitter1 = new QSplitter( this );
     mSplitter2 = new QSplitter( mSplitter1 );
 
     QWidget * folderTreeWidget = mSearchAndTree;
     if ( mFavoriteCollectionsView ) {
         mFolderViewSplitter = new QSplitter( Qt::Vertical );
         mFolderViewSplitter->setOpaqueResize( opaqueResize );
         //mFolderViewSplitter->setChildrenCollapsible( false );
         mFolderViewSplitter->addWidget( mFavoriteCollectionsView );
         mFavoriteCollectionsView->setParent( mFolderViewSplitter );
         mFolderViewSplitter->addWidget( mSearchAndTree );
         folderTreeWidget = mFolderViewSplitter;
     }
 
     if ( mLongFolderList ) {
 
         // add folder tree
         mSplitter1->setOrientation( Qt::Horizontal );
         mSplitter1->addWidget( folderTreeWidget );
 
         // and the rest to the right
         mSplitter1->addWidget( mSplitter2 );
 
         // add the message list to the right or below
         if ( readerWindowAtSide ) {
             mSplitter2->setOrientation( Qt::Horizontal );
         } else {
             mSplitter2->setOrientation( Qt::Vertical );
         }
         mSplitter2->addWidget( mMessagePane );
 
         // add the preview window, if there is one
         if ( mMsgView ) {
             mSplitter2->addWidget( mMsgView );
         }
 
     } else { // short folder list
         if ( mReaderWindowBelow ) {
             mSplitter1->setOrientation( Qt::Vertical );
             mSplitter2->setOrientation( Qt::Horizontal );
         } else { // at side or none
             mSplitter1->setOrientation( Qt::Horizontal );
             mSplitter2->setOrientation( Qt::Vertical );
         }
 
         mSplitter1->addWidget( mSplitter2 );
 
         // add folder tree
         mSplitter2->addWidget( folderTreeWidget );
         // add message list to splitter 2
         mSplitter2->addWidget( mMessagePane );
 
         // add the preview window, if there is one
         if ( mMsgView )
             mSplitter1->addWidget( mMsgView );
     }
 
     //
     // Set splitter properties
     //
     mSplitter1->setObjectName( QLatin1String("splitter1") );
     mSplitter1->setOpaqueResize( opaqueResize );
     //mSplitter1->setChildrenCollapsible( false );
     mSplitter2->setObjectName( QLatin1String("splitter2") );
     mSplitter2->setOpaqueResize( opaqueResize );
     //mSplitter2->setChildrenCollapsible( false );
 
     //
     // Set the stretch factors
     //
     mSplitter1->setStretchFactor( 0, 0 );
     mSplitter2->setStretchFactor( 0, 0 );
     mSplitter1->setStretchFactor( 1, 1 );
     mSplitter2->setStretchFactor( 1, 1 );
 
     if ( mFavoriteCollectionsView ) {
         mFolderViewSplitter->setStretchFactor( 0, 0 );
         mFolderViewSplitter->setStretchFactor( 1, 1 );
     }
 
     // Because the reader windows's width increases a tiny bit after each
     // restart in short folder list mode with message window at side, disable
     // the stretching as a workaround here
     if ( readerWindowAtSide && !mLongFolderList ) {
         mSplitter1->setStretchFactor( 0, 1 );
         mSplitter1->setStretchFactor( 1, 0 );
     }
 
     //
     // Set the sizes of the splitters to the values stored in the config
     //
     QList<int> splitter1Sizes;
     QList<int> splitter2Sizes;
 
     const int folderViewWidth = GlobalSettings::self()->folderViewWidth();
     int ftHeight = GlobalSettings::self()->folderTreeHeight();
     int headerHeight = GlobalSettings::self()->searchAndHeaderHeight();
     const int messageViewerWidth = GlobalSettings::self()->readerWindowWidth();
     int headerWidth = GlobalSettings::self()->searchAndHeaderWidth();
     int messageViewerHeight = GlobalSettings::self()->readerWindowHeight();
 
     int ffvHeight = mFolderViewSplitter ? MailCommon::MailCommonSettings::self()->favoriteCollectionViewHeight() : 0;
 
     // If the message viewer was hidden before, make sure it is not zero height
     if ( messageViewerHeight < 10 && readerWindowBelow ) {
         headerHeight /= 2;
         messageViewerHeight = headerHeight;
     }
 
     if ( mLongFolderList ) {
         if ( !readerWindowAtSide ) {
             splitter1Sizes << folderViewWidth << headerWidth;
             splitter2Sizes << headerHeight << messageViewerHeight;
         } else {
             splitter1Sizes << folderViewWidth << ( headerWidth + messageViewerWidth );
             splitter2Sizes << headerWidth << messageViewerWidth;
         }
     } else {
         if ( !readerWindowAtSide ) {
             splitter1Sizes << headerHeight << messageViewerHeight;
             splitter2Sizes << folderViewWidth << headerWidth;
         } else {
             splitter1Sizes << headerWidth << messageViewerWidth;
             splitter2Sizes << ftHeight + ffvHeight << messageViewerHeight;
         }
     }
 
     mSplitter1->setSizes( splitter1Sizes );
     mSplitter2->setSizes( splitter2Sizes );
 
     if ( mFolderViewSplitter ) {
         QList<int> splitterSizes;
         splitterSizes << ffvHeight << ftHeight;
         mFolderViewSplitter->setSizes( splitterSizes );
     }
 
     //
     // Now add the splitters to the main layout
     //
     mTopLayout->addWidget( mSplitter1 );
 
     // Make sure the focus is on the view, and not on the quick search line edit, because otherwise
     // shortcuts like + or j go to the wrong place.
     // This would normally be done in the message list itself, but apparently something resets the focus
     // again, probably all the reparenting we do here.
     mMessagePane->focusView();
 
     // By default hide th unread and size columns on first run.
     if ( kmkernel->firstStart() )
     {
         mFolderTreeWidget->folderTreeView()->hideColumn( 1 );
         mFolderTreeWidget->folderTreeView()->hideColumn( 3 );
         mFolderTreeWidget->folderTreeView()->header()->resizeSection( 0, folderViewWidth * 0.8 );
     }
 
     // Make the copy action work, see disconnect comment above
     if ( mMsgView )
         connect( mMsgView->copyAction(), SIGNAL(triggered(bool)),
                  mMsgView, SLOT(slotCopySelectedText()) );
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::refreshFavoriteFoldersViewProperties()
 {
     if ( mFavoriteCollectionsView ) {
         if ( MailCommon::MailCommonSettings::self()->favoriteCollectionViewMode() == MailCommon::MailCommonSettings::EnumFavoriteCollectionViewMode::IconMode )
             mFavoriteCollectionsView->setViewMode( QListView::IconMode );
         else if ( MailCommon::MailCommonSettings::self()->favoriteCollectionViewMode() == MailCommon::MailCommonSettings::EnumFavoriteCollectionViewMode::ListMode )
             mFavoriteCollectionsView->setViewMode( QListView::ListMode );
         else
             Q_ASSERT(false); // we should never get here in hidden mode
         mFavoriteCollectionsView->setDropActionMenuEnabled( kmkernel->showPopupAfterDnD() );
         mFavoriteCollectionsView->setWordWrap( true );
         mFavoriteCollectionsView->updateMode();
     }
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::readConfig()
 {
     const bool oldLongFolderList = mLongFolderList;
     const bool oldReaderWindowActive = mReaderWindowActive;
     const bool oldReaderWindowBelow = mReaderWindowBelow;
     const bool oldFavoriteFolderView = mEnableFavoriteFolderView;
     const bool oldFolderQuickSearch = mEnableFolderQuickSearch;
 
     // on startup, the layout is always new and we need to relayout the widgets
     bool layoutChanged = !mStartupDone;
 
     if ( mStartupDone )
     {
         readPreConfig();
 
         layoutChanged = ( oldLongFolderList != mLongFolderList ) ||
                 ( oldReaderWindowActive != mReaderWindowActive ) ||
                 ( oldReaderWindowBelow != mReaderWindowBelow ) ||
                 ( oldFavoriteFolderView != mEnableFavoriteFolderView );
 
         if ( layoutChanged ) {
             deleteWidgets();
             createWidgets();
             restoreCollectionFolderViewConfig();
             emit recreateGui();
         } else if ( oldFolderQuickSearch != mEnableFolderQuickSearch ) {
             if ( mEnableFolderQuickSearch )
                 mFolderTreeWidget->filterFolderLineEdit()->show();
             else
                 mFolderTreeWidget->filterFolderLineEdit()->hide();
         }
     }
 
 
     { // Read the config of the folder views and the header
         if ( mMsgView ) {
             mMsgView->readConfig();
         }
         mMessagePane->reloadGlobalConfiguration();
         mFolderTreeWidget->readConfig();
         if ( mFavoriteCollectionsView ) {
             mFavoriteCollectionsView->readConfig();
         }
         refreshFavoriteFoldersViewProperties();
     }
 
     { // area for config group "General"
         if ( !mStartupDone )
         {
             // check mail on startup
             // do it after building the kmmainwin, so that the progressdialog is available
             QTimer::singleShot( 0, this, SLOT(slotCheckMailOnStartup()) );
         }
     }
 
     if ( layoutChanged ) {
         layoutSplitters();
     }
 
     updateMessageMenu();
     updateFileMenu();
     kmkernel->toggleSystemTray();
 
     connect( Akonadi::AgentManager::self(), SIGNAL(instanceAdded(Akonadi::AgentInstance)),
              this, SLOT(updateFileMenu()) );
     connect( Akonadi::AgentManager::self(), SIGNAL(instanceRemoved(Akonadi::AgentInstance)),
              this, SLOT(updateFileMenu()) );
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::writeConfig(bool force)
 {
     // Don't save the sizes of all the widgets when we were never shown.
     // This can happen in Kontact, where the KMail plugin is automatically
     // loaded, but not necessarily shown.
     // This prevents invalid sizes from being saved
     if ( mWasEverShown ) {
         // The height of the header widget can be 0, this happens when the user
         // did not switch to the header widget onced and the "Welcome to KMail"
         // HTML widget was shown the whole time
         int headersHeight = mMessagePane->height();
         if ( headersHeight == 0 )
             headersHeight = height() / 2;
 
         GlobalSettings::self()->setSearchAndHeaderHeight( headersHeight );
         GlobalSettings::self()->setSearchAndHeaderWidth( mMessagePane->width() );
         if ( mFavoriteCollectionsView ) {
             MailCommon::MailCommonSettings::self()->setFavoriteCollectionViewHeight( mFavoriteCollectionsView->height() );
             GlobalSettings::self()->setFolderTreeHeight( mFolderTreeWidget->height() );
             if ( !mLongFolderList ) {
                 GlobalSettings::self()->setFolderViewHeight( mFolderViewSplitter->height() );
             }
         }
         else if ( !mLongFolderList && mFolderTreeWidget )
         {
             GlobalSettings::self()->setFolderTreeHeight( mFolderTreeWidget->height() );
         }
         if ( mFolderTreeWidget )
         {
             GlobalSettings::self()->setFolderViewWidth( mFolderTreeWidget->width() );
             KSharedConfig::Ptr config = KMKernel::self()->config();
             KConfigGroup group(config, "CollectionFolderView");
 
             ETMViewStateSaver saver;
             saver.setView( mFolderTreeWidget->folderTreeView() );
             saver.saveState( group );
 
             group.writeEntry( "HeaderState", mFolderTreeWidget->folderTreeView()->header()->saveState() );
             //Work around from startup folder
             group.deleteEntry( "Selection" );
 #if 0
             if (!GlobalSettings::self()->startSpecificFolderAtStartup()) {
                 group.deleteEntry( "Current" );
             }
 #endif
             group.sync();
         }
 
         if ( mMsgView ) {
             if ( !mReaderWindowBelow )
                 GlobalSettings::self()->setReaderWindowWidth( mMsgView->width() );
             mMsgView->viewer()->writeConfig(force);
             GlobalSettings::self()->setReaderWindowHeight( mMsgView->height() );
         }
     }
 }
 
 void KMMainWidget::writeReaderConfig()
 {
     if ( mWasEverShown ) {
         if ( mMsgView ) {
             mMsgView->viewer()->writeConfig();
         }
     }
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::deleteWidgets()
 {
     // Simply delete the top splitter, which always is mSplitter1, regardless
     // of the layout. This deletes all children.
     // akonadi action manager is created in createWidgets(), parented to this
     //  so not autocleaned up.
     delete mAkonadiStandardActionManager;
     mAkonadiStandardActionManager = 0;
     delete mSplitter1;
     mMsgView = 0;
     mSearchAndTree = 0;
     mFolderViewSplitter = 0;
     mFavoriteCollectionsView = 0;
     mSplitter1 = 0;
     mSplitter2 = 0;
     mFavoritesModel = 0;
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::createWidgets()
 {
     // Note that all widgets we create in this function have the parent 'this'.
     // They will be properly reparented in layoutSplitters()
 
     //
     // Create header view and search bar
     //
     FolderTreeWidget::TreeViewOptions opt = FolderTreeWidget::ShowUnreadCount;
     opt |= FolderTreeWidget::UseLineEditForFiltering;
     opt |= FolderTreeWidget::ShowCollectionStatisticAnimation;
     opt |= FolderTreeWidget::DontKeyFilter;
     mFolderTreeWidget = new FolderTreeWidget( this, mGUIClient, opt );
 
     connect( mFolderTreeWidget->folderTreeView(), SIGNAL(currentChanged(Akonadi::Collection)), this, SLOT(slotFolderChanged(Akonadi::Collection)) );
 
     connect( mFolderTreeWidget->folderTreeView()->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(updateFolderMenu()) );
 
     connect( mFolderTreeWidget->folderTreeView(), SIGNAL(prefereCreateNewTab(bool)), this, SLOT(slotCreateNewTab(bool)) );
 
     mFolderTreeWidget->setSelectionMode( QAbstractItemView::ExtendedSelection );
     mMessagePane = new CollectionPane( !GlobalSettings::self()->startSpecificFolderAtStartup(), KMKernel::self()->entityTreeModel(),
                                        mFolderTreeWidget->folderTreeView()->selectionModel(),
                                        this );
     connect( KMKernel::self()->entityTreeModel(), SIGNAL(collectionFetched(int)), this, SLOT(slotCollectionFetched(int)));
 
     mMessagePane->setXmlGuiClient( mGUIClient );
     connect( mMessagePane, SIGNAL(messageSelected(Akonadi::Item)),
              this, SLOT(slotMessageSelected(Akonadi::Item)) );
     connect( mMessagePane, SIGNAL(selectionChanged()),
              SLOT(startUpdateMessageActionsTimer()) );
     connect( mMessagePane, SIGNAL(currentTabChanged()), this, SLOT(refreshMessageListSelection()) );
     connect( mMessagePane, SIGNAL(messageActivated(Akonadi::Item)),
              this, SLOT(slotMessageActivated(Akonadi::Item)) );
     connect( mMessagePane, SIGNAL(messageStatusChangeRequest(Akonadi::Item,Akonadi::MessageStatus,Akonadi::MessageStatus)),
              SLOT(slotMessageStatusChangeRequest(Akonadi::Item,Akonadi::MessageStatus,Akonadi::MessageStatus)) );
 
     connect( mMessagePane, SIGNAL(statusMessage(QString)),
              BroadcastStatus::instance(), SLOT(setStatusMsg(QString)) );
 
 
     //
     // Create the reader window
     //
     if ( mReaderWindowActive ) {
         mMsgView = new KMReaderWin( this, this, actionCollection(), 0 );
         if ( mMsgActions ) {
             mMsgActions->setMessageView( mMsgView );
         }
         connect( mMsgView->viewer(), SIGNAL(replaceMsgByUnencryptedVersion()),
                  this, SLOT(slotReplaceMsgByUnencryptedVersion()) );
         connect( mMsgView->viewer(), SIGNAL(popupMenu(Akonadi::Item,KUrl,KUrl,QPoint)),
                  this, SLOT(slotMessagePopup(Akonadi::Item,KUrl,KUrl,QPoint)) );
         connect( mMsgView->viewer(), SIGNAL(moveMessageToTrash()),
                  this, SLOT(slotMoveMessageToTrash()) );
     }
     else {
         if ( mMsgActions ) {
             mMsgActions->setMessageView( 0 );
         }
     }
 
     //
     // Create the folder tree
     // the "folder tree" consists of a quicksearch input field and the tree itself
     //
 
     mSearchAndTree = new QWidget( this );
     QVBoxLayout *vboxlayout = new QVBoxLayout;
     vboxlayout->setMargin(0);
     mSearchAndTree->setLayout( vboxlayout );
 
     vboxlayout->addWidget( mFolderTreeWidget );
 
     if ( !GlobalSettings::self()->enableFolderQuickSearch() ) {
         mFolderTreeWidget->filterFolderLineEdit()->hide();
     }
     //
     // Create the favorite folder view
     //
     mAkonadiStandardActionManager = new Akonadi::StandardMailActionManager( mGUIClient->actionCollection(), this );
     connect( mAkonadiStandardActionManager, SIGNAL(actionStateUpdated()), this, SLOT(slotAkonadiStandardActionUpdated()) );
 
     mAkonadiStandardActionManager->setCollectionSelectionModel( mFolderTreeWidget->folderTreeView()->selectionModel() );
     mAkonadiStandardActionManager->setItemSelectionModel( mMessagePane->currentItemSelectionModel() );
 
     if ( mEnableFavoriteFolderView ) {
 
         mFavoriteCollectionsView = new FavoriteCollectionWidget( mGUIClient, this );
         refreshFavoriteFoldersViewProperties();
 
         connect( mFavoriteCollectionsView, SIGNAL(currentChanged(Akonadi::Collection)), this, SLOT(slotFolderChanged(Akonadi::Collection)) );
 
         mFavoritesModel = new Akonadi::FavoriteCollectionsModel(
                     mFolderTreeWidget->folderTreeView()->model(),
                     KMKernel::self()->config()->group( "FavoriteCollections" ), this );
 
         mFavoriteCollectionsView->setModel( mFavoritesModel );
 
         Akonadi::CollectionStatisticsDelegate *delegate = new Akonadi::CollectionStatisticsDelegate( mFavoriteCollectionsView );
         delegate->setProgressAnimationEnabled( true );
         mFavoriteCollectionsView->setItemDelegate(delegate);
         delegate->setUnreadCountShown( true );
 
         mAkonadiStandardActionManager->setFavoriteCollectionsModel( mFavoritesModel );
         mAkonadiStandardActionManager->setFavoriteSelectionModel( mFavoriteCollectionsView->selectionModel() );
     }
 
     //Don't use mMailActionManager->createAllActions() to save memory by not
     //creating actions that doesn't make sense.
     QList<StandardActionManager::Type> standardActions;
     standardActions << StandardActionManager::CreateCollection
                     << StandardActionManager::CopyCollections
                     << StandardActionManager::DeleteCollections
                     << StandardActionManager::SynchronizeCollections
                     << StandardActionManager::CollectionProperties
                     << StandardActionManager::CopyItems
                     << StandardActionManager::Paste
                     << StandardActionManager::DeleteItems
                     << StandardActionManager::ManageLocalSubscriptions
                     << StandardActionManager::CopyCollectionToMenu
                     << StandardActionManager::CopyItemToMenu
                     << StandardActionManager::MoveItemToMenu
                     << StandardActionManager::MoveCollectionToMenu
                     << StandardActionManager::CutItems
                     << StandardActionManager::CutCollections
                     << StandardActionManager::CreateResource
                     << StandardActionManager::DeleteResources
                     << StandardActionManager::ResourceProperties
                     << StandardActionManager::SynchronizeResources
                     << StandardActionManager::ToggleWorkOffline
                     << StandardActionManager::SynchronizeCollectionsRecursive;
 
     Q_FOREACH( StandardActionManager::Type standardAction, standardActions ) {
         mAkonadiStandardActionManager->createAction( standardAction );
     }
 
 
     if (mEnableFavoriteFolderView) {
         QList<StandardActionManager::Type> favoriteActions;
         favoriteActions << StandardActionManager::AddToFavoriteCollections
                         << StandardActionManager::RemoveFromFavoriteCollections
                         << StandardActionManager::RenameFavoriteCollection
                         << StandardActionManager::SynchronizeFavoriteCollections;
         Q_FOREACH( StandardActionManager::Type favoriteAction, favoriteActions) {
             mAkonadiStandardActionManager->createAction( favoriteAction );
         }
     }
 
     QList<StandardMailActionManager::Type> mailActions;
     mailActions << StandardMailActionManager::MarkAllMailAsRead
                 << StandardMailActionManager::MoveToTrash
                 << StandardMailActionManager::MoveAllToTrash
                 << StandardMailActionManager::RemoveDuplicates
                 << StandardMailActionManager::EmptyAllTrash
                 << StandardMailActionManager::MarkMailAsRead
                 << StandardMailActionManager::MarkMailAsUnread
                 << StandardMailActionManager::MarkMailAsImportant
                 << StandardMailActionManager::MarkMailAsActionItem;
 
     Q_FOREACH( StandardMailActionManager::Type mailAction, mailActions ) {
         mAkonadiStandardActionManager->createAction( mailAction );
     }
 
     mAkonadiStandardActionManager->interceptAction( Akonadi::StandardActionManager::CollectionProperties );
     connect( mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::CollectionProperties ), SIGNAL(triggered(bool)), this, SLOT(slotCollectionProperties()) );
 
 
     //
     // Create all kinds of actions
     //
     mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::RemoveDuplicates )->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_Asterisk ) );
     mAkonadiStandardActionManager->interceptAction( Akonadi::StandardMailActionManager::RemoveDuplicates );
     connect( mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::RemoveDuplicates ), SIGNAL(triggered(bool)), this, SLOT(slotRemoveDuplicates()) );
 
     {
         mCollectionProperties = mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::CollectionProperties );
     }
     connect( kmkernel->folderCollectionMonitor(), SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection)),
              SLOT(slotItemAdded(Akonadi::Item,Akonadi::Collection)) );
     connect( kmkernel->folderCollectionMonitor(), SIGNAL(itemRemoved(Akonadi::Item)),
              SLOT(slotItemRemoved(Akonadi::Item)) );
     connect( kmkernel->folderCollectionMonitor(), SIGNAL(itemMoved(Akonadi::Item,Akonadi::Collection,Akonadi::Collection)),
              SLOT(slotItemMoved(Akonadi::Item,Akonadi::Collection,Akonadi::Collection)) );
     connect( kmkernel->folderCollectionMonitor(), SIGNAL(collectionChanged(Akonadi::Collection,QSet<QByteArray>)), SLOT(slotCollectionChanged(Akonadi::Collection,QSet<QByteArray>)) );
 
     connect( kmkernel->folderCollectionMonitor(), SIGNAL(collectionStatisticsChanged(Akonadi::Collection::Id,Akonadi::CollectionStatistics)), SLOT(slotCollectionStatisticsChanged(Akonadi::Collection::Id,Akonadi::CollectionStatistics)) );
 
 }
 
 void KMMainWidget::updateMoveAction( const Akonadi::CollectionStatistics& statistic )
 {
     const bool hasUnreadMails = (statistic.unreadCount() > 0);
     const bool hasMails = (statistic.count()>0);
     updateMoveAction(hasUnreadMails,hasMails);
 }
 
 void KMMainWidget::updateMoveAction( bool hasUnreadMails, bool hasMails )
 {
     const bool enable_goto_unread = hasUnreadMails
             || (GlobalSettings::self()->loopOnGotoUnread() == GlobalSettings::EnumLoopOnGotoUnread::LoopInAllFolders)
             || (GlobalSettings::self()->loopOnGotoUnread() == GlobalSettings::EnumLoopOnGotoUnread::LoopInAllMarkedFolders);
     actionCollection()->action( QLatin1String("go_next_message") )->setEnabled( hasMails );
     actionCollection()->action( QLatin1String("go_next_unread_message") )->setEnabled( enable_goto_unread );
     actionCollection()->action( QLatin1String("go_prev_message") )->setEnabled( hasMails );
     actionCollection()->action( QLatin1String("go_prev_unread_message") )->setEnabled( enable_goto_unread );
     if ( mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::MarkAllMailAsRead ) ) {
         mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::MarkAllMailAsRead )->setEnabled(hasUnreadMails);
     }
 }
 
 void KMMainWidget::updateAllToTrashAction(int statistics)
 {
     bool multiFolder = false;
     if ( mFolderTreeWidget ) {
         multiFolder = mFolderTreeWidget->selectedCollections().count() > 1;
     }
     if ( mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::MoveAllToTrash ) ) {
         const bool folderWithContent = mCurrentFolder && !mCurrentFolder->isStructural();
         mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::MoveAllToTrash )->setEnabled( folderWithContent
                                                                                                                  && ( statistics > 0 )
                                                                                                                  && mCurrentFolder->canDeleteMessages()
                                                                                                                  && !multiFolder );
     }
 }
 
 void KMMainWidget::slotCollectionStatisticsChanged( const Akonadi::Collection::Id id, const Akonadi::CollectionStatistics& statistic )
 {
     if ( id == CommonKernel->outboxCollectionFolder().id() ) {
         const qint64 nbMsgOutboxCollection = statistic.count();
         mSendQueued->setEnabled( nbMsgOutboxCollection > 0 );
         mSendActionMenu->setEnabled( nbMsgOutboxCollection > 0 );
     } else if ( mCurrentFolder && ( id == mCurrentFolder->collection().id() ) ) {
         updateMoveAction( statistic );
         updateAllToTrashAction(statistic.count());
         mCurrentFolder->setCollection(MailCommon::Util::updatedCollection( mCurrentFolder->collection() ));
     }
 }
 
 void KMMainWidget::slotCreateNewTab( bool preferNewTab )
 {
     mMessagePane->setPreferEmptyTab( preferNewTab );
 }
 
 void KMMainWidget::slotCollectionChanged( const Akonadi::Collection&collection, const QSet<QByteArray>&set )
 {
     if ( mCurrentFolder
          && ( collection == mCurrentFolder->collection() )
          && ( set.contains( "MESSAGEFOLDER" ) || set.contains( "expirationcollectionattribute" ) ) ) {
         if ( set.contains( "MESSAGEFOLDER" ) )
             mMessagePane->resetModelStorage();
         else {
             mCurrentFolder->setCollection( collection );
         }
     } else if ( set.contains( "ENTITYDISPLAY" ) || set.contains( "NAME" ) ) {
 
         QIcon icon = KIcon( QLatin1String( "folder" ) );
         QString text;
 
         const QModelIndex idx = Akonadi::EntityTreeModel::modelIndexForCollection( KMKernel::self()->collectionModel(), collection );
         if ( idx.isValid() ) {
             text = idx.data().toString();
             icon = idx.data( Qt::DecorationRole ).value<QIcon>();
             mMessagePane->updateTabIconText( collection, text,icon );
         }
     }
 }
 
 
 void KMMainWidget::slotItemAdded( const Akonadi::Item &msg, const Akonadi::Collection &col )
 {
 
     if ( col.isValid() ) {
         if ( col == CommonKernel->outboxCollectionFolder() ) {
             startUpdateMessageActionsTimer();
         }
     }
 }
 
 void KMMainWidget::slotItemRemoved( const Akonadi::Item & item)
 {
     if ( item.isValid() && item.parentCollection().isValid() && ( item.parentCollection() == CommonKernel->outboxCollectionFolder() ) ) {
         startUpdateMessageActionsTimer();
     }
 }
 
 void KMMainWidget::slotItemMoved( const Akonadi::Item &item, const Akonadi::Collection &from, const Akonadi::Collection &to )
 {
     if ( item.isValid() && ( ( from.id() == CommonKernel->outboxCollectionFolder().id() )
                              || to.id() == CommonKernel->outboxCollectionFolder().id() ) ) {
         startUpdateMessageActionsTimer();
     }
 }
 
 //-------------------------------------------------------------------------
 void KMMainWidget::slotFocusQuickSearch()
 {
     mMessagePane->focusQuickSearch();
 }
 
 //-------------------------------------------------------------------------
 bool KMMainWidget::slotSearch()
 {
     if (!mSearchWin)
     {
         mSearchWin = new SearchWindow(this, mCurrentFolder ? mCurrentFolder->collection() : Akonadi::Collection());
         mSearchWin->setModal( false );
         mSearchWin->setObjectName( QLatin1String("Search") );
     }
     else
     {
         mSearchWin->activateFolder(mCurrentFolder ? mCurrentFolder->collection() : Akonadi::Collection());
     }
 
     mSearchWin->show();
     KWindowSystem::activateWindow( mSearchWin->winId() );
     return true;
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotHelp()
 {
     KToolInvocation::invokeHelp();
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotFilter()
 {
     FilterIf->openFilterDialog( true );
 }
 
 void KMMainWidget::slotManageSieveScripts()
 {
     if ( !kmkernel->askToGoOnline() ) {
         return;
     }
     if (mManageSieveDialog)
         return;
 
     mManageSieveDialog = new KSieveUi::ManageSieveScriptsDialog( this );
     mManageSieveDialog->show();
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotAddrBook()
 {
     KRun::runCommand(QLatin1String("kaddressbook"), window());
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotImport()
 {
     KRun::runCommand(QLatin1String("kmailcvt"), window());
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotCheckMail()
 {
     kmkernel->checkMail();
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotCheckMailOnStartup()
 {
     kmkernel->checkMailOnStartup();
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotCheckOneAccount( QAction* item )
 {
     if ( !item ) {
         return;
     }
 
     Akonadi::AgentInstance agent = Akonadi::AgentManager::self()->instance( item->data().toString() );
     if ( agent.isValid() ) {
         if ( !agent.isOnline() ) {
             agent.setIsOnline( true );
         }
         agent.synchronize();
     } else {
         kDebug() << "account with identifier" << item->data().toString() << "not found";
     }
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotCompose()
 {
     KMail::Composer * win;
     KMime::Message::Ptr msg( new KMime::Message() );
 
     bool forceCursorPosition = false;
     if ( mCurrentFolder ) {
         MessageHelper::initHeader( msg, KMKernel::self()->identityManager(), mCurrentFolder->identity() );
         //Laurent: bug 289905
         /*
       if ( mCurrentFolder->collection().isValid() && mCurrentFolder->putRepliesInSameFolder() ) {
         KMime::Headers::Generic *header = new KMime::Headers::Generic( "X-KMail-Fcc", msg.get(), QString::number( mCurrentFolder->collection().id() ), "utf-8" );
         msg->setHeader( header );
       }
       */
         TemplateParser::TemplateParser parser( msg, TemplateParser::TemplateParser::NewMessage );
         parser.setIdentityManager( KMKernel::self()->identityManager() );
         parser.process( msg, mCurrentFolder->collection() );
         win = KMail::makeComposer( msg, false, false, KMail::Composer::New, mCurrentFolder->identity() );
         win->setCollectionForNewMessage( mCurrentFolder->collection() );
         forceCursorPosition = parser.cursorPositionWasSet();
     } else {
         MessageHelper::initHeader( msg, KMKernel::self()->identityManager() );
         TemplateParser::TemplateParser parser( msg, TemplateParser::TemplateParser::NewMessage );
         parser.setIdentityManager( KMKernel::self()->identityManager() );
         parser.process( KMime::Message::Ptr(), Akonadi::Collection() );
         win = KMail::makeComposer( msg, false, false, KMail::Composer::New );
         forceCursorPosition = parser.cursorPositionWasSet();
     }
     if (forceCursorPosition) {
         win->setFocusToEditor();
     }
     win->show();
 
 }
 
 //-----------------------------------------------------------------------------
 // TODO: do we want the list sorted alphabetically?
 void KMMainWidget::slotShowNewFromTemplate()
 {
     if ( mCurrentFolder ) {
         const KPIMIdentities::Identity & ident =
                 kmkernel->identityManager()->identityForUoidOrDefault( mCurrentFolder->identity() );
         mTemplateFolder = CommonKernel->collectionFromId( ident.templates().toLongLong() );
     }
 
     if ( !mTemplateFolder.isValid() ) {
         mTemplateFolder = CommonKernel->templatesCollectionFolder();
     }
     if ( !mTemplateFolder.isValid() )
         return;
 
     mTemplateMenu->menu()->clear();
 
     Akonadi::ItemFetchJob *job = new Akonadi::ItemFetchJob( mTemplateFolder );
     job->fetchScope().setAncestorRetrieval( ItemFetchScope::Parent );
     job->fetchScope().fetchFullPayload();
     connect( job, SIGNAL(result(KJob*)), SLOT(slotDelayedShowNewFromTemplate(KJob*)) );
 }
 
 void KMMainWidget::slotDelayedShowNewFromTemplate( KJob *job )
 {
     Akonadi::ItemFetchJob *fetchJob = qobject_cast<Akonadi::ItemFetchJob*>( job );
 
     const Akonadi::Item::List items = fetchJob->items();
     const int numberOfItems = items.count();
     for ( int idx = 0; idx < numberOfItems; ++idx ) {
         KMime::Message::Ptr msg = MessageCore::Util::message( items.at( idx ) );
         if ( msg ) {
             QString subj = msg->subject()->asUnicodeString();
             if ( subj.isEmpty() )
                 subj = i18n("No Subject");
 
             QAction *templateAction = mTemplateMenu->menu()->addAction(KStringHandler::rsqueeze( subj.replace( QLatin1Char('&'), QLatin1String("&&") ) ) );
             QVariant var;
             var.setValue( items.at( idx ) );
             templateAction->setData( var );
         }
     }
 
     // If there are no templates available, add a menu entry which informs
     // the user about this.
     if ( mTemplateMenu->menu()->actions().isEmpty() ) {
         QAction *noAction = mTemplateMenu->menu()->addAction(
                     i18n( "(no templates)" ) );
         noAction->setEnabled( false );
     }
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotNewFromTemplate( QAction *action )
 {
 
     if ( !mTemplateFolder.isValid() )
         return;
     const Akonadi::Item item = action->data().value<Akonadi::Item>();
     newFromTemplate( item );
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::newFromTemplate( const Akonadi::Item &msg )
 {
     if ( !msg.isValid() )
         return;
     KMCommand *command = new KMUseTemplateCommand( this, msg );
     command->start();
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotPostToML()
 {
     if ( mCurrentFolder && mCurrentFolder->isMailingListEnabled() ) {
         if (KMail::Util::mailingListPost( mCurrentFolder )) {
             return;
         }
     }
     slotCompose();
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotFolderMailingListProperties()
 {
     showCollectionProperties( QLatin1String( "KMail::CollectionMailingListPage" ) );
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotShowFolderShortcutDialog()
 {
     showCollectionProperties( QLatin1String( "KMail::CollectionShortcutPage" ) );
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotExpireFolder()
 {
     if ( !mCurrentFolder )
         return;
     bool mustDeleteExpirationAttribute = false;
     MailCommon::ExpireCollectionAttribute *attr = MailCommon::ExpireCollectionAttribute::expirationCollectionAttribute( mCurrentFolder->collection(), mustDeleteExpirationAttribute );
     ;
     bool canBeExpired = true;
     if ( !attr->isAutoExpire() ) {
         canBeExpired = false;
     } else if ( attr->unreadExpireUnits() == MailCommon::ExpireCollectionAttribute::ExpireNever &&
                 attr->readExpireUnits() == MailCommon::ExpireCollectionAttribute::ExpireNever ) {
         canBeExpired = false;
     }
 
     if ( !canBeExpired ) {
         const QString message = i18n( "This folder does not have any expiry options set" );
         KMessageBox::information( this, message );
         if ( mustDeleteExpirationAttribute )
             delete attr;
         return;
     }
 
     if ( GlobalSettings::self()->warnBeforeExpire() ) {
         const QString message = i18n( "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>",
                                       Qt::escape( mCurrentFolder->name() ) );
         if ( KMessageBox::warningContinueCancel( this, message, i18n( "Expire Folder" ),
                                                  KGuiItem( i18n( "&Expire" ) ) )
              != KMessageBox::Continue ) {
             if ( mustDeleteExpirationAttribute )
                 delete attr;
             return;
         }
     }
 
     MailCommon::Util::expireOldMessages( mCurrentFolder->collection(), true /*immediate*/ );
     if ( mustDeleteExpirationAttribute )
         delete attr;
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotEmptyFolder()
 {
     if (!mCurrentFolder) return;
     const bool isTrash = CommonKernel->folderIsTrash( mCurrentFolder->collection() );
     if ( GlobalSettings::self()->confirmBeforeEmpty() )
     {
         const QString title = (isTrash) ? i18n("Empty Trash") : i18n("Move to Trash");
         const QString text = (isTrash) ?
                     i18n("Are you sure you want to empty the trash folder?") :
                     i18n("<qt>Are you sure you want to move all messages from "
                          "folder <b>%1</b> to the trash?</qt>", Qt::escape( mCurrentFolder->name() ) );
 
         if (KMessageBox::warningContinueCancel(this, text, title, KGuiItem( title, QLatin1String("user-trash")))
                 != KMessageBox::Continue) return;
     }
 #ifndef QT_NO_CURSOR
     MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() );
 #endif
     slotMarkAll();
     if (isTrash) {
         /* Don't ask for confirmation again when deleting, the user has already
        confirmed. */
         slotDeleteMsg( false );
     }
     else
         slotTrashSelectedMessages();
 
     if (mMsgView)
         mMsgView->clearCache();
 
     if ( !isTrash )
         BroadcastStatus::instance()->setStatusMsg(i18n("Moved all messages to the trash"));
 
     updateMessageActions();
 
     // Disable empty trash/move all to trash action - we've just deleted/moved
     // all folder contents.
     mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::MoveAllToTrash )->setEnabled( false );
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotArchiveFolder()
 {
     if ( mCurrentFolder && mCurrentFolder->collection().isValid() ) {
         KMail::ArchiveFolderDialog archiveDialog;
         archiveDialog.setFolder( mCurrentFolder->collection() );
         archiveDialog.exec();
     }
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotRemoveFolder()
 {
     if ( !mCurrentFolder ) return;
     if ( !mCurrentFolder->collection().isValid() ) return;
     if ( mCurrentFolder->isSystemFolder() ) return;
     if ( mCurrentFolder->isReadOnly() ) return;
 
     Akonadi::CollectionFetchJob *job = new Akonadi::CollectionFetchJob( mCurrentFolder->collection(), CollectionFetchJob::FirstLevel, this );
     job->fetchScope().setContentMimeTypes( QStringList() << KMime::Message::mimeType() );
     job->setProperty( "collectionId", mCurrentFolder->collection().id() );
     connect( job, SIGNAL(result(KJob*)), SLOT(slotDelayedRemoveFolder(KJob*)) );
 }
 
 void KMMainWidget::slotDelayedRemoveFolder( KJob *job )
 {
     const Akonadi::CollectionFetchJob *fetchJob = qobject_cast<Akonadi::CollectionFetchJob*>( job );
     Akonadi::Collection::List listOfCollection = fetchJob->collections();
     const bool hasNotSubDirectory = listOfCollection.isEmpty();
 
     const Akonadi::Collection::Id id = fetchJob->property( "collectionId" ).toLongLong();
     Akonadi::Collection col = MailCommon::Util::updatedCollection(CommonKernel->collectionFromId( id ));
     QDir dir;
     QString str;
     QString title;
     QString buttonLabel;
     if ( col.resource() == QLatin1String( "akonadi_search_resource" ) ) {
         title = i18n("Delete Search");
         str = i18n("<qt>Are you sure you want to delete the search <b>%1</b>?<br />"
                    "Any messages it shows will still be available in their original folder.</qt>",
                    Qt::escape( col.name() ) );
         buttonLabel = i18nc("@action:button Delete search", "&Delete");
     } else {
         title = i18n("Delete Folder");
 
 
         if ( col.statistics().count() == 0 ) {
             if ( hasNotSubDirectory ) {
                 str = i18n("<qt>Are you sure you want to delete the empty folder "
                            "<b>%1</b>?</qt>",
                            Qt::escape( col.name() ) );
             } else {
                 str = i18n("<qt>Are you sure you want to delete the empty folder "
                            "<resource>%1</resource> and all its subfolders? Those subfolders might "
                            "not be empty and their contents will be discarded as well. "
                            "<p><b>Beware</b> that discarded messages are not saved "
                            "into your Trash folder and are permanently deleted.</p></qt>",
                            Qt::escape( col.name() ) );
             }
         } else {
             if ( hasNotSubDirectory ) {
                 str = i18n("<qt>Are you sure you want to delete the folder "
                            "<resource>%1</resource>, discarding its contents? "
                            "<p><b>Beware</b> that discarded messages are not saved "
                            "into your Trash folder and are permanently deleted.</p></qt>",
                            Qt::escape( col.name() ) );
             }else {
                 str = i18n("<qt>Are you sure you want to delete the folder <resource>%1</resource> "
                            "and all its subfolders, discarding their contents? "
                            "<p><b>Beware</b> that discarded messages are not saved "
                            "into your Trash folder and are permanently deleted.</p></qt>",
                            Qt::escape( col.name() ) );
             }
         }
         buttonLabel = i18nc("@action:button Delete folder", "&Delete");
     }
 
     if ( KMessageBox::warningContinueCancel( this, str, title,
                                              KGuiItem( buttonLabel, QLatin1String("edit-delete" )),
                                              KStandardGuiItem::cancel(), QString(),
                                              KMessageBox::Notify | KMessageBox::Dangerous )
          == KMessageBox::Continue )
     {
         kmkernel->checkFolderFromResources( listOfCollection<<col );
 
         if (col.id() == mCurrentFolder->collection().id())
             mCurrentFolder.clear();
 
         Akonadi::CollectionDeleteJob *job = new Akonadi::CollectionDeleteJob( col );
         connect( job, SIGNAL(result(KJob*)), this, SLOT(slotDeletionCollectionResult(KJob*)) );
     }
 }
 
 void KMMainWidget::slotDeletionCollectionResult(KJob* job)
 {
     if ( job ) {
         if (Util::showJobErrorMessage( job )) {
             return;
         }
     }
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotExpireAll()
 {
     if ( GlobalSettings::self()->warnBeforeExpire() ) {
         const int ret = KMessageBox::warningContinueCancel(KMainWindow::memberList().first(),
                                                            i18n("Are you sure you want to expire all old messages?"),
                                                            i18n("Expire Old Messages?"), KGuiItem(i18n("Expire")));
         if (ret != KMessageBox::Continue) {
             return;
         }
     }
 
     kmkernel->expireAllFoldersNow();
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotOverrideHtml()
 {
     if ( mHtmlPref == mFolderHtmlPref ) {
         int result = KMessageBox::warningContinueCancel( this,
                                                          // the warning text is taken from configuredialog.cpp:
                                                          i18n( "Use of HTML in mail will make you more vulnerable to "
                                                                "\"spam\" and may increase the likelihood that your system will be "
                                                                "compromised by other present and anticipated security exploits." ),
                                                          i18n( "Security Warning" ),
                                                          KGuiItem(i18n( "Use HTML" )),
                                                          KStandardGuiItem::cancel(),
                                                          QLatin1String("OverrideHtmlWarning"), 0);
         if ( result == KMessageBox::Cancel ) {
             mPreferHtmlAction->setChecked( false );
             return;
         }
     }
     mFolderHtmlPref = !mFolderHtmlPref;
 
     //Update mPrefererHtmlLoadExtAction
     mPreferHtmlLoadExtAction->setEnabled( mCurrentFolder && (mHtmlPref ? !mFolderHtmlPref : mFolderHtmlPref) ? true : false );
 
     if (mMsgView) {
         mMsgView->setHtmlOverride(mFolderHtmlPref);
         mMsgView->update( true );
     }
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotOverrideHtmlLoadExt()
 {
     if ( mHtmlLoadExtPref == mFolderHtmlLoadExtPref ) {
         int result = KMessageBox::warningContinueCancel( this,
                                                          // the warning text is taken from configuredialog.cpp:
                                                          i18n( "Loading external references in html mail will make you more vulnerable to "
                                                                "\"spam\" and may increase the likelihood that your system will be "
                                                                "compromised by other present and anticipated security exploits." ),
                                                          i18n( "Security Warning" ),
                                                          KGuiItem(i18n( "Load External References" )),
                                                          KStandardGuiItem::cancel(),
                                                          QLatin1String("OverrideHtmlLoadExtWarning"), 0);
         if ( result == KMessageBox::Cancel ) {
             mPreferHtmlLoadExtAction->setChecked( false );
             return;
         }
     }
     mFolderHtmlLoadExtPref = !mFolderHtmlLoadExtPref;
 
     if (mMsgView) {
         mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref);
         mMsgView->update( true );
     }
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotMessageQueuedOrDrafted()
 {
     if (!CommonKernel->folderIsDraftOrOutbox(mCurrentFolder->collection()))
         return;
     if (mMsgView)
         mMsgView->update(true);
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotForwardInlineMsg()
 {
     if ( !mCurrentFolder ) {
         return;
     }
 
     const QList<Akonadi::Item> selectedMessages = mMessagePane->selectionAsMessageItemList();
     if ( selectedMessages.isEmpty() )
         return;
     KMForwardCommand * command = new KMForwardCommand(
                 this, selectedMessages, mCurrentFolder->identity()
                 );
 
     command->start();
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotForwardAttachedMsg()
 {
     if ( !mCurrentFolder ) {
         return;
     }
 
     const QList<Akonadi::Item> selectedMessages = mMessagePane->selectionAsMessageItemList();
     if ( selectedMessages.isEmpty() )
         return;
     KMForwardAttachedCommand * command = new KMForwardAttachedCommand(
                 this, selectedMessages, mCurrentFolder->identity()
                 );
 
     command->start();
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotUseTemplate()
 {
     newFromTemplate( mMessagePane->currentItem() );
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotResendMsg()
 {
     const Akonadi::Item msg = mMessagePane->currentItem();
     if ( !msg.isValid() )
         return;
     KMCommand *command = new KMResendMessageCommand( this, msg );
 
     command->start();
 }
 
 //-----------------------------------------------------------------------------
 // Message moving and permanent deletion
 //
 
 void KMMainWidget::moveMessageSelected( MessageList::Core::MessageItemSetReference ref, const Akonadi::Collection &dest, bool confirmOnDeletion )
 {
     QList<Akonadi::Item> selectMsg  = mMessagePane->itemListFromPersistentSet( ref );
     // If this is a deletion, ask for confirmation
     if ( !dest.isValid() && confirmOnDeletion )
     {
         int ret = KMessageBox::warningContinueCancel(
                     this,
                     i18np(
                         "<qt>Do you really want to delete the selected message?<br />"
                         "Once deleted, it cannot be restored.</qt>",
                         "<qt>Do you really want to delete the %1 selected messages?<br />"
                         "Once deleted, they cannot be restored.</qt>",
                         selectMsg.count()
                         ),
                     selectMsg.count() > 1 ? i18n( "Delete Messages" ) : i18n( "Delete Message" ),
                     KStandardGuiItem::del(),
                     KStandardGuiItem::cancel(),
                     QLatin1String("NoConfirmDelete")
                     );
         if ( ret == KMessageBox::Cancel )
         {
             mMessagePane->deletePersistentSet( ref );
             return;  // user canceled the action
         }
     }
     mMessagePane->markMessageItemsAsAboutToBeRemoved( ref, true );
     // And stuff them into a KMMoveCommand :)
     KMMoveCommand *command = new KMMoveCommand( dest, selectMsg,ref );
     QObject::connect(
                 command, SIGNAL(moveDone(KMMoveCommand*)),
                 this, SLOT(slotMoveMessagesCompleted(KMMoveCommand*))
                 );
     command->start();
 
     if ( dest.isValid() )
         BroadcastStatus::instance()->setStatusMsg( i18n( "Moving messages..." ) );
     else
         BroadcastStatus::instance()->setStatusMsg( i18n( "Deleting messages..." ) );
 }
 
 void KMMainWidget::slotMoveMessagesCompleted( KMMoveCommand *command )
 {
     Q_ASSERT( command );
     mMessagePane->markMessageItemsAsAboutToBeRemoved( command->refSet(), false );
     mMessagePane->deletePersistentSet( command->refSet() );
     // Bleah :D
     const bool moveWasReallyADelete = !command->destFolder().isValid();
 
     if ( command->result() == KMCommand::OK )
     {
         if ( moveWasReallyADelete )
             BroadcastStatus::instance()->setStatusMsg( i18n( "Messages deleted successfully." ) );
         else
             BroadcastStatus::instance()->setStatusMsg( i18n( "Messages moved successfully." ) );
     } else {
         if ( moveWasReallyADelete )
         {
             if ( command->result() == KMCommand::Failed )
                 BroadcastStatus::instance()->setStatusMsg( i18n( "Deleting messages failed." ) );
             else
                 BroadcastStatus::instance()->setStatusMsg( i18n( "Deleting messages canceled." ) );
         } else {
             if ( command->result() == KMCommand::Failed )
                 BroadcastStatus::instance()->setStatusMsg( i18n( "Moving messages failed." ) );
             else
                 BroadcastStatus::instance()->setStatusMsg( i18n( "Moving messages canceled." ) );
         }
     }
     // The command will autodelete itself and will also kill the set.
 }
 
 void KMMainWidget::slotDeleteMsg( bool confirmDelete )
 {
     // Create a persistent message set from the current selection
     MessageList::Core::MessageItemSetReference ref = mMessagePane->selectionAsPersistentSet();
     if ( ref != -1 )
         moveMessageSelected( ref, Akonadi::Collection(), confirmDelete );
 }
 
 void KMMainWidget::slotDeleteThread( bool confirmDelete )
 {
     // Create a persistent set from the current thread.
     MessageList::Core::MessageItemSetReference ref = mMessagePane->currentThreadAsPersistentSet();
     if ( ref != -1 )
         moveMessageSelected( ref, Akonadi::Collection(), confirmDelete );
 }
 
 FolderSelectionDialog* KMMainWidget::moveOrCopyToDialog()
 {
     if ( !mMoveOrCopyToDialog ) {
         FolderSelectionDialog::SelectionFolderOption options = FolderSelectionDialog::HideVirtualFolder;
         mMoveOrCopyToDialog = new FolderSelectionDialog( this, options );
         mMoveOrCopyToDialog->setModal( true );
     }
     return mMoveOrCopyToDialog;
 }
 
 FolderSelectionDialog* KMMainWidget::selectFromAllFoldersDialog()
 {
     if ( !mSelectFromAllFoldersDialog ) {
         FolderSelectionDialog::SelectionFolderOptions options = FolderSelectionDialog::None;
         options |= FolderSelectionDialog::NotAllowToCreateNewFolder;
 
         mSelectFromAllFoldersDialog = new FolderSelectionDialog( this, options );
         mSelectFromAllFoldersDialog->setModal( true );
     }
     return mSelectFromAllFoldersDialog;
 }
 
 void KMMainWidget::slotMoveSelectedMessageToFolder()
 {
     QPointer<MailCommon::FolderSelectionDialog> dialog( moveOrCopyToDialog() );
     dialog->setCaption( i18n( "Move Messages to Folder" ) );
     if ( dialog->exec() && dialog ) {
         const Akonadi::Collection dest = dialog->selectedCollection();
         if ( dest.isValid() ) {
             moveSelectedMessagesToFolder( dest );
         }
     }
 }
 
 void KMMainWidget::moveSelectedMessagesToFolder( const Akonadi::Collection & dest )
 {
     MessageList::Core::MessageItemSetReference ref = mMessagePane->selectionAsPersistentSet();
     if ( ref != -1 ) {
         //Need to verify if dest == src ??? akonadi do it for us.
         moveMessageSelected( ref, dest, false );
     }
 }
 
 
 void KMMainWidget::copyMessageSelected( const QList<Akonadi::Item> &selectMsg, const Akonadi::Collection &dest )
 {
     if ( selectMsg.isEmpty() )
         return;
     // And stuff them into a KMCopyCommand :)
     KMCommand *command = new KMCopyCommand( dest, selectMsg );
     QObject::connect(
                 command, SIGNAL(completed(KMCommand*)),
                 this, SLOT(slotCopyMessagesCompleted(KMCommand*))
                 );
     command->start();
     BroadcastStatus::instance()->setStatusMsg( i18n( "Copying messages..." ) );
 }
 
 
 void KMMainWidget::slotCopyMessagesCompleted( KMCommand *command )
 {
     Q_ASSERT( command );
     if ( command->result() == KMCommand::OK )
     {
         BroadcastStatus::instance()->setStatusMsg( i18n( "Messages copied successfully." ) );
     } else {
         if ( command->result() == KMCommand::Failed )
             BroadcastStatus::instance()->setStatusMsg( i18n( "Copying messages failed." ) );
         else
             BroadcastStatus::instance()->setStatusMsg( i18n( "Copying messages canceled." ) );
     }
     // The command will autodelete itself and will also kill the set.
 }
 
 void KMMainWidget::slotCopySelectedMessagesToFolder()
 {
     QPointer<MailCommon::FolderSelectionDialog> dialog( moveOrCopyToDialog() );
     dialog->setCaption( i18n( "Copy Messages to Folder" ) );
 
     if ( dialog->exec() && dialog ) {
         const Akonadi::Collection dest = dialog->selectedCollection();
         if ( dest.isValid() ) {
             copySelectedMessagesToFolder( dest );
         }
     }
 }
 
 void KMMainWidget::copySelectedMessagesToFolder( const Akonadi::Collection& dest )
 {
     const QList<Akonadi::Item > lstMsg = mMessagePane->selectionAsMessageItemList();
     if ( !lstMsg.isEmpty() ) {
         copyMessageSelected( lstMsg, dest );
     }
 }
 
 //-----------------------------------------------------------------------------
 // Message trashing
 //
 void KMMainWidget::trashMessageSelected( MessageList::Core::MessageItemSetReference ref )
 {
     if ( !mCurrentFolder ) {
         return;
     }
 
     const QList<Akonadi::Item> select = mMessagePane->itemListFromPersistentSet( ref );
     mMessagePane->markMessageItemsAsAboutToBeRemoved( ref, true );
 
     // FIXME: Why we don't use KMMoveCommand( trashFolder(), selectedMessages ); ?
     // And stuff them into a KMTrashMsgCommand :)
     KMCommand *command = new KMTrashMsgCommand( mCurrentFolder->collection(), select,ref );
 
     QObject::connect(
                 command, SIGNAL(moveDone(KMMoveCommand*)),
                 this, SLOT(slotTrashMessagesCompleted(KMMoveCommand*))
                 );
     command->start();
     BroadcastStatus::instance()->setStatusMsg( i18n( "Moving messages to trash..." ) );
 }
 
 void KMMainWidget::slotTrashMessagesCompleted( KMMoveCommand *command )
 {
     Q_ASSERT( command );
     mMessagePane->markMessageItemsAsAboutToBeRemoved( command->refSet(), false );
     mMessagePane->deletePersistentSet( command->refSet() );
     if ( command->result() == KMCommand::OK )
     {
         BroadcastStatus::instance()->setStatusMsg( i18n( "Messages moved to trash successfully." ) );
     } else {
         if ( command->result() == KMCommand::Failed ) {
             BroadcastStatus::instance()->setStatusMsg( i18n( "Moving messages to trash failed." ) );
         } else
             BroadcastStatus::instance()->setStatusMsg( i18n( "Moving messages to trash canceled." ) );
     }
 
     // The command will autodelete itself and will also kill the set.
 }
 
 void KMMainWidget::slotTrashSelectedMessages()
 {
     MessageList::Core::MessageItemSetReference ref = mMessagePane->selectionAsPersistentSet();
     if ( ref != -1 ) {
         trashMessageSelected( ref );
     }
 }
 
 void KMMainWidget::slotTrashThread()
 {
     MessageList::Core::MessageItemSetReference ref = mMessagePane->currentThreadAsPersistentSet();
     if ( ref != -1 )
         trashMessageSelected( ref );
 }
 
 //-----------------------------------------------------------------------------
 // Message tag setting for messages
 //
 // FIXME: The "selection" version of these functions is in MessageActions.
 //        We should probably move everything there....
 void KMMainWidget::toggleMessageSetTag( const QList<Akonadi::Item> &select, const Akonadi::Tag &tag )
 {
     if ( select.isEmpty() )
         return;
     KMCommand *command = new KMSetTagCommand( Akonadi::Tag::List() << tag, select, KMSetTagCommand::Toggle );
     command->start();
 }
 
 
 void KMMainWidget::slotSelectMoreMessageTagList()
 {
     const QList<Akonadi::Item> selectedMessages = mMessagePane->selectionAsMessageItemList();
     if ( selectedMessages.isEmpty() )
         return;
 
     TagSelectDialog dlg( this, selectedMessages.count(), selectedMessages.first() );
     if ( dlg.exec() ) {
         const Akonadi::Tag::List lst = dlg.selectedTag();
 
         KMCommand *command = new KMSetTagCommand( lst, selectedMessages, KMSetTagCommand::CleanExistingAndAddNew );
         command->start();
     }
 }
 
 
 void KMMainWidget::slotUpdateMessageTagList( const Akonadi::Tag &tag )
 {
     // Create a persistent set from the current thread.
     const QList<Akonadi::Item> selectedMessages = mMessagePane->selectionAsMessageItemList();
     if ( selectedMessages.isEmpty() )
         return;
     toggleMessageSetTag( selectedMessages, tag );
 }
 
 void KMMainWidget::refreshMessageListSelection()
 {
     mAkonadiStandardActionManager->setItemSelectionModel( mMessagePane->currentItemSelectionModel() );
     slotMessageSelected(mMessagePane->currentItem());
 }
 
 //-----------------------------------------------------------------------------
 // Status setting for threads
 //
 // FIXME: The "selection" version of these functions is in MessageActions.
 //        We should probably move everything there....
 void KMMainWidget::setMessageSetStatus( const QList<Akonadi::Item> &select,
                                         const Akonadi::MessageStatus &status,
                                         bool toggle )
 {
     KMCommand *command = new KMSetStatusCommand( status, select, toggle );
     command->start();
 }
 
 void KMMainWidget::setCurrentThreadStatus( const Akonadi::MessageStatus &status, bool toggle )
 {
     const QList<Akonadi::Item> select = mMessagePane->currentThreadAsMessageList();
     if ( select.isEmpty() )
         return;
     setMessageSetStatus( select, status, toggle );
 }
 
 void KMMainWidget::slotSetThreadStatusUnread()
 {
     setCurrentThreadStatus( MessageStatus::statusRead(), true );
 }
 
 void KMMainWidget::slotSetThreadStatusImportant()
 {
     setCurrentThreadStatus( MessageStatus::statusImportant(), true );
 }
 
 void KMMainWidget::slotSetThreadStatusRead()
 {
     setCurrentThreadStatus( MessageStatus::statusRead(), false );
 }
 
 void KMMainWidget::slotSetThreadStatusToAct()
 {
     setCurrentThreadStatus( MessageStatus::statusToAct(), true );
 }
 
 void KMMainWidget::slotSetThreadStatusWatched()
 {
     setCurrentThreadStatus( MessageStatus::statusWatched(), true );
     if ( mWatchThreadAction->isChecked() )
         mIgnoreThreadAction->setChecked(false);
 }
 
 void KMMainWidget::slotSetThreadStatusIgnored()
 {
     setCurrentThreadStatus( MessageStatus::statusIgnored(), true );
     if ( mIgnoreThreadAction->isChecked() )
         mWatchThreadAction->setChecked(false);
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotRedirectMsg()
 {
     const QList<Akonadi::Item> selectedMessages = mMessagePane->selectionAsMessageItemList();
     if ( selectedMessages.isEmpty() )
         return;
 
     KMCommand *command = new KMRedirectCommand( this, selectedMessages );
     command->start();
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotCustomReplyToMsg( const QString &tmpl )
 {
     const Akonadi::Item msg = mMessagePane->currentItem();
     if ( !msg.isValid() )
         return;
 
     const QString text = mMsgView ? mMsgView->copyText() : QString();
 
     kDebug() << "Reply with template:" << tmpl;
 
     KMCommand *command = new KMReplyCommand( this,
                                              msg,
                                              MessageComposer::ReplySmart,
                                              text, false,
                                              tmpl );
     command->start();
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotCustomReplyAllToMsg( const QString &tmpl )
 {
     const Akonadi::Item msg = mMessagePane->currentItem();
     if ( !msg.isValid() )
         return;
 
     const QString text = mMsgView? mMsgView->copyText() : QString();
 
     kDebug() << "Reply to All with template:" << tmpl;
 
     KMCommand *command = new KMReplyCommand(this,
                                             msg,
                                             MessageComposer::ReplyAll,
                                             text,
                                             false,
                                             tmpl
                                             );
 
     command->start();
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotCustomForwardMsg( const QString &tmpl )
 {
     if ( !mCurrentFolder ) {
         return;
     }
 
     const QList<Akonadi::Item> selectedMessages = mMessagePane->selectionAsMessageItemList();
     if ( selectedMessages.isEmpty() )
         return;
 
     kDebug() << "Forward with template:" << tmpl;
     KMForwardCommand * command = new KMForwardCommand(
                 this, selectedMessages, mCurrentFolder->identity(), tmpl
                 );
 
     command->start();
 }
 
 
 void KMMainWidget::openFilterDialog(const QByteArray &field, const QString &value)
 {
     FilterIf->openFilterDialog( false );
     FilterIf->createFilter( field, value );
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSubjectFilter()
 {
     const KMime::Message::Ptr msg = mMessagePane->currentMessage();
     if ( !msg )
         return;
 
     openFilterDialog("Subject", msg->subject()->asUnicodeString());
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotFromFilter()
 {
     KMime::Message::Ptr msg = mMessagePane->currentMessage();
     if ( !msg )
         return;
 
     AddrSpecList al = MessageHelper::extractAddrSpecs( msg, "From" );
     if ( al.empty() )
         openFilterDialog("From",  msg->from()->asUnicodeString());
     else
         openFilterDialog("From",  al.front().asString());
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotToFilter()
 {
     KMime::Message::Ptr msg = mMessagePane->currentMessage();
     if ( !msg )
         return;
     openFilterDialog("To",  msg->to()->asUnicodeString());
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotUndo()
 {
     kmkernel->undoStack()->undo();
     updateMessageActions();
     updateFolderMenu();
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotJumpToFolder()
 {
     QPointer<MailCommon::FolderSelectionDialog> dialog( selectFromAllFoldersDialog() );
     dialog->setCaption( i18n( "Jump to Folder") );
     if ( dialog->exec() && dialog ) {
         Akonadi::Collection collection = dialog->selectedCollection();
         if ( collection.isValid() ) {
             slotSelectCollectionFolder( collection );
         }
     }
 }
 
 void KMMainWidget::slotSelectCollectionFolder( const Akonadi::Collection & col )
 {
     if ( mFolderTreeWidget ) {
         mFolderTreeWidget->selectCollectionFolder( col );
         slotFolderChanged( col );
     }
 }
 
 void KMMainWidget::slotApplyFilters()
 {
     const QList<Akonadi::Item> selectedMessages = mMessagePane->selectionAsMessageItemList();
     if ( selectedMessages.isEmpty() )
         return;
     applyFilters( selectedMessages );
 }
 
 void KMMainWidget::slotApplyFiltersOnFolder()
 {
     if ( mCurrentFolder && mCurrentFolder->collection().isValid() ) {
         Akonadi::ItemFetchJob *job = new Akonadi::ItemFetchJob( mCurrentFolder->collection(), this );
         connect( job, SIGNAL(result(KJob*)), this, SLOT(slotFetchItemsForFolderDone(KJob*)) );
     }
 }
 
 void KMMainWidget::slotFetchItemsForFolderDone(KJob*job)
 {
     Akonadi::ItemFetchJob *fjob = dynamic_cast<Akonadi::ItemFetchJob*>( job );
     Q_ASSERT( fjob );
     Akonadi::Item::List items = fjob->items();
     applyFilters( items );
 }
 
 void KMMainWidget::applyFilters( const QList<Akonadi::Item>& selectedMessages )
 {
 #ifndef QT_NO_CURSOR
     MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() );
 #endif
 
     MailCommon::FilterManager::instance()->filter( selectedMessages );
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotCheckVacation()
 {
     updateVacationScriptStatus( false );
     if ( !kmkernel->askToGoOnline() )
         return;
 
     mVacationManager->checkVacation();
     connect(mVacationManager, SIGNAL(updateVacationScriptStatus(bool,QString)), SLOT(updateVacationScriptStatus(bool,QString)) );
     connect(mVacationManager, SIGNAL(editVacation()), SLOT(slotEditVacation()) );
 }
 
 void KMMainWidget::slotEditVacation(const QString &serverName)
 {
     if ( !kmkernel->askToGoOnline() ) {
         return;
     }
 
     mVacationManager->slotEditVacation(serverName);
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotDebugSieve()
 {
 #if !defined(NDEBUG)
     if ( mSieveDebugDialog )
         return;
 
     mSieveDebugDialog = new KSieveUi::SieveDebugDialog( this );
     mSieveDebugDialog->exec();
     delete mSieveDebugDialog;
 #endif
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotStartCertManager()
 {
     if ( !QProcess::startDetached(QLatin1String("kleopatra") ) )
         KMessageBox::error( this, i18n( "Could not start certificate manager; "
                                         "please check your installation." ),
                             i18n( "KMail Error" ) );
     else
         kDebug() << "\nslotStartCertManager(): certificate manager started.";
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotStartWatchGnuPG()
 {
     if ( !QProcess::startDetached(QLatin1String("kwatchgnupg")) )
         KMessageBox::error( this, i18n( "Could not start GnuPG LogViewer (kwatchgnupg); "
                                         "please check your installation." ),
                             i18n( "KMail Error" ) );
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotConfigChanged()
 {
     readConfig();
     mMsgActions->setupForwardActions();
     mMsgActions->setupForwardingActionsList( mGUIClient );
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSaveMsg()
 {
     const QList<Akonadi::Item> selectedMessages = mMessagePane->selectionAsMessageItemList();
     if ( selectedMessages.isEmpty() )
         return;
     KMSaveMsgCommand *saveCommand = new KMSaveMsgCommand( this, selectedMessages );
     saveCommand->start();
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotOpenMsg()
 {
     KMOpenMsgCommand *openCommand = new KMOpenMsgCommand( this, KUrl(), overrideEncoding(), this );
 
     openCommand->start();
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSaveAttachments()
 {
     const QList<Akonadi::Item> selectedMessages = mMessagePane->selectionAsMessageItemList();
     if ( selectedMessages.isEmpty() )
         return;
 
     // Avoid re-downloading in the common case that only one message is selected, and the message
     // is also displayed in the viewer. For this, create a dummy item without a parent collection / item id,
     // so that KMCommand doesn't download it.
     KMSaveAttachmentsCommand *saveCommand = 0;
     if ( mMsgView && selectedMessages.size() == 1 &&
          mMsgView->message().hasPayload<KMime::Message::Ptr>() &&
          selectedMessages.first().id() == mMsgView->message().id() ) {
         Akonadi::Item dummyItem;
         dummyItem.setPayload<KMime::Message::Ptr>( mMsgView->message().payload<KMime::Message::Ptr>() );
         saveCommand = new KMSaveAttachmentsCommand( this, dummyItem );
     } else {
         saveCommand = new KMSaveAttachmentsCommand( this, selectedMessages );
     }
 
     saveCommand->start();
 }
 
 void KMMainWidget::slotOnlineStatus()
 {
     // KMKernel will emit a signal when we toggle the network state that is caught by
     // KMMainWidget::slotUpdateOnlineStatus to update our GUI
     if ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Online ) {
         // if online; then toggle and set it offline.
         kmkernel->stopNetworkJobs();
     } else {
         kmkernel->resumeNetworkJobs();
         slotCheckVacation();
     }
 }
 
 void KMMainWidget::slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type )
 {
     if ( !mAkonadiStandardActionManager ) {
         return;
     }
     KAction * action = mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::ToggleWorkOffline );
     if ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Online ) {
         action->setText( i18n("Work Offline") );
         action->setIcon( KIcon(QLatin1String("user-offline")) );
     } else {
         action->setText( i18n("Work Online") );
         action->setIcon( KIcon(QLatin1String("user-online")) );
     }
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSendQueued()
 {
     if ( kmkernel->msgSender() ) {
         kmkernel->msgSender()->sendQueued();
     }
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotSendQueuedVia( QAction *item )
 {
     const QStringList availTransports = MailTransport::TransportManager::self()->transportNames();
     if ( !availTransports.isEmpty() && availTransports.contains( item->text() ) ) {
         if ( kmkernel->msgSender() ) {
             kmkernel->msgSender()->sendQueued( item->text() );
         }
     }
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotShowBusySplash()
 {
     if ( mReaderWindowActive ) {
         mMsgView->displayBusyPage();
     }
 }
 
 void KMMainWidget::showOfflinePage()
 {
     if ( !mReaderWindowActive ) return;
 
     mMsgView->displayOfflinePage();
 }
 
 void KMMainWidget::showResourceOfflinePage()
 {
     if ( !mReaderWindowActive ) return;
 
     mMsgView->displayResourceOfflinePage();
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotReplaceMsgByUnencryptedVersion()
 {
     kDebug();
     Akonadi::Item oldMsg = mMessagePane->currentItem();
     if ( oldMsg.isValid() ) {
 #if 0
         kDebug() << "Old message found";
         if ( oldMsg->hasUnencryptedMsg() ) {
             kDebug() << "Extra unencrypted message found";
             KMime::Message* newMsg = oldMsg->unencryptedMsg();
             // adjust the message id
             {
                 QString msgId( oldMsg->msgId() );
                 QString prefix("DecryptedMsg.");
                 int oldIdx = msgId.indexOf(prefix, 0, Qt::CaseInsensitive);
                 if ( -1 == oldIdx ) {
                     int leftAngle = msgId.lastIndexOf( '<' );
                     msgId = msgId.insert( (-1 == leftAngle) ? 0 : ++leftAngle, prefix );
                 }
                 else {
                     // toggle between "DecryptedMsg." and "DeCryptedMsg."
                     // to avoid same message id
                     QCharRef c = msgId[ oldIdx+2 ];
                     if ( 'C' == c )
                         c = 'c';
                     else
                         c = 'C';
                 }
                 newMsg->setMsgId( msgId );
                 mMsgView->setIdOfLastViewedMessage( msgId );
             }
             // insert the unencrypted message
             kDebug() << "Adding unencrypted message to folder";
             mFolder->addMsg( newMsg );
             /* Figure out its index in the folder for selecting. This must be count()-1,
        * since we append. Be safe and do find, though, just in case. */
             int newMsgIdx = mFolder->find( newMsg );
             Q_ASSERT( newMsgIdx != -1 );
             /* we need this unget, to have the message displayed correctly initially */
             mFolder->unGetMsg( newMsgIdx );
             int idx = mFolder->find( oldMsg );
             Q_ASSERT( idx != -1 );
             /* only select here, so the old one is not un-Gotten before, which would
        * render the pointer we hold invalid so that find would fail */
 #if 0
             // FIXME (Pragma)
             mHeaders->setCurrentItemByIndex( newMsgIdx );
 #endif
             // remove the old one
             if ( idx != -1 ) {
                 kDebug() << "Deleting encrypted message";
                 mFolder->take( idx );
             }
 
             kDebug() << "Updating message actions";
             updateMessageActions();
 
             kDebug() << "Done.";
         } else
             kDebug() << "NO EXTRA UNENCRYPTED MESSAGE FOUND";
 #else
         kDebug() << "AKONADI PORT: Disabled code in  " << Q_FUNC_INFO;
 #endif
     } else
         kDebug() << "PANIC: NO OLD MESSAGE FOUND";
 }
 
 void KMMainWidget::slotFocusOnNextMessage()
 {
     mMessagePane->focusNextMessageItem(MessageList::Core::MessageTypeAny, true,false );
 }
 
 void KMMainWidget::slotFocusOnPrevMessage()
 {
     mMessagePane->focusPreviousMessageItem( MessageList::Core::MessageTypeAny, true, false );
 }
 
 void KMMainWidget::slotSelectFirstMessage()
 {
     mMessagePane->selectFirstMessageItem( MessageList::Core::MessageTypeAny, true );
 }
 
 void KMMainWidget::slotSelectLastMessage()
 {
     mMessagePane->selectLastMessageItem( MessageList::Core::MessageTypeAny, true );
 }
 
 void KMMainWidget::slotSelectFocusedMessage()
 {
     mMessagePane->selectFocusedMessageItem(true );
 }
 
 void KMMainWidget::slotSelectNextMessage()
 {
     mMessagePane->selectNextMessageItem( MessageList::Core::MessageTypeAny,
                                          MessageList::Core::ClearExistingSelection,
                                          true, false );
 }
 
 void KMMainWidget::slotExtendSelectionToNextMessage()
 {
     mMessagePane->selectNextMessageItem(
                 MessageList::Core::MessageTypeAny,
                 MessageList::Core::GrowOrShrinkExistingSelection,
                 true,  // center item
                 false  // don't loop in folder
                 );
 }
 
 void KMMainWidget::slotSelectNextUnreadMessage()
 {
     // The looping logic is: "Don't loop" just never loops, "Loop in current folder"
     // loops just in current folder, "Loop in all folders" loops in the current folder
     // first and then after confirmation jumps to the next folder.
     // A bad point here is that if you answer "No, and don't ask me again" to the confirmation
     // dialog then you have "Loop in current folder" and "Loop in all folders" that do
     // the same thing and no way to get the old behaviour. However, after a consultation on #kontact,
     // for bug-to-bug backward compatibility, the masters decided to keep it b0rken :D
     // If nobody complains, it stays like it is: if you complain enough maybe the masters will
     // decide to reconsider :)
     if ( !mMessagePane->selectNextMessageItem(
              MessageList::Core::MessageTypeUnreadOnly,
              MessageList::Core::ClearExistingSelection,
              true,  // center item
              /*GlobalSettings::self()->loopOnGotoUnread() == GlobalSettings::EnumLoopOnGotoUnread::LoopInCurrentFolder*/
              GlobalSettings::self()->loopOnGotoUnread() != GlobalSettings::EnumLoopOnGotoUnread::DontLoop
              ) )
     {
         // no next unread message was found in the current folder
         if ( ( GlobalSettings::self()->loopOnGotoUnread() ==
                GlobalSettings::EnumLoopOnGotoUnread::LoopInAllFolders ) ||
              ( GlobalSettings::self()->loopOnGotoUnread() ==
                GlobalSettings::EnumLoopOnGotoUnread::LoopInAllMarkedFolders ) )
         {
             mGoToFirstUnreadMessageInSelectedFolder = true;
             mFolderTreeWidget->folderTreeView()->selectNextUnreadFolder( true );
             mGoToFirstUnreadMessageInSelectedFolder = false;
         }
     }
 }
 
 void KMMainWidget::slotSelectPreviousMessage()
 {
     mMessagePane->selectPreviousMessageItem( MessageList::Core::MessageTypeAny,
                                              MessageList::Core::ClearExistingSelection,
                                              true, false );
 }
 
 void KMMainWidget::slotExtendSelectionToPreviousMessage()
 {
     mMessagePane->selectPreviousMessageItem(
                 MessageList::Core::MessageTypeAny,
                 MessageList::Core::GrowOrShrinkExistingSelection,
                 true,  // center item
                 false  // don't loop in folder
                 );
 }
 
 void KMMainWidget::slotSelectPreviousUnreadMessage()
 {
     if ( !mMessagePane->selectPreviousMessageItem(
              MessageList::Core::MessageTypeUnreadOnly,
              MessageList::Core::ClearExistingSelection,
              true,  // center item
              GlobalSettings::self()->loopOnGotoUnread() == GlobalSettings::EnumLoopOnGotoUnread::LoopInCurrentFolder
              ) )
     {
         // no next unread message was found in the current folder
         if ( ( GlobalSettings::self()->loopOnGotoUnread() ==
                GlobalSettings::EnumLoopOnGotoUnread::LoopInAllFolders ) ||
              ( GlobalSettings::self()->loopOnGotoUnread() ==
                GlobalSettings::EnumLoopOnGotoUnread::LoopInAllMarkedFolders ) )
         {
             mGoToFirstUnreadMessageInSelectedFolder = true;
             mFolderTreeWidget->folderTreeView()->selectPrevUnreadFolder();
             mGoToFirstUnreadMessageInSelectedFolder = false;
         }
     }
 }
 
 void KMMainWidget::slotDisplayCurrentMessage()
 {
     if ( mMessagePane->currentItem().isValid() && !mMessagePane->searchEditHasFocus() )
         slotMessageActivated( mMessagePane->currentItem() );
 }
 
 // Called by double-clicked or 'Enter' in the messagelist -> pop up reader window
 void KMMainWidget::slotMessageActivated( const Akonadi::Item &msg )
 {
     if ( !mCurrentFolder || !msg.isValid() )
         return;
 
     if ( CommonKernel->folderIsDraftOrOutbox( mCurrentFolder->collection() ) )
     {
         mMsgActions->setCurrentMessage( msg );
         mMsgActions->editCurrentMessage();
         return;
     }
 
     if ( CommonKernel->folderIsTemplates( mCurrentFolder->collection() ) ) {
         slotUseTemplate();
         return;
     }
 
     // Try to fetch the mail, even in offline mode, it might be cached
     ItemFetchJob *itemFetchJob = MessageViewer::Viewer::createFetchJob( msg );
     connect( itemFetchJob, SIGNAL(itemsReceived(Akonadi::Item::List)),
              SLOT(slotItemsFetchedForActivation(Akonadi::Item::List)) );
     connect( itemFetchJob, SIGNAL(result(KJob*)),
              SLOT(itemsFetchForActivationDone(KJob*)) );
 }
 
 void KMMainWidget::slotItemsFetchedForActivation( const Akonadi::Item::List &list )
 {
     Q_ASSERT( list.size() == 1 );
 
     const Item msg = list.first();
 
     KMReaderMainWin *win = new KMReaderMainWin( mFolderHtmlPref, mFolderHtmlLoadExtPref );
     const bool useFixedFont = mMsgView ? mMsgView->isFixedFont() :
                                          MessageViewer::GlobalSettings::self()->useFixedFont();
     win->setUseFixedFont( useFixedFont );
 
 
     const Akonadi::Collection parentCollection = MailCommon::Util::parentCollectionFromItem(msg);
     win->showMessage( overrideEncoding(), msg, parentCollection );
     win->show();
 }
 
 void KMMainWidget::itemsFetchForActivationDone( KJob * job )
 {
     if ( job->error() ) {
         kDebug() << job->error() << job->errorString();
         BroadcastStatus::instance()->setStatusMsg( job->errorString() );
     }
 }
 
 void KMMainWidget::slotMessageStatusChangeRequest( const Akonadi::Item &item, const Akonadi::MessageStatus & set, const Akonadi::MessageStatus &clear )
 {
     if ( !item.isValid() )
         return;
 
     if ( clear.toQInt32() != Akonadi::MessageStatus().toQInt32() )
     {
         KMCommand *command = new KMSetStatusCommand( clear, Akonadi::Item::List() << item, true );
         command->start();
     }
 
     if ( set.toQInt32() != Akonadi::MessageStatus().toQInt32() )
     {
         KMCommand *command = new KMSetStatusCommand( set, Akonadi::Item::List() << item, false );
         command->start();
     }
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotMarkAll()
 {
     mMessagePane->selectAll();
     updateMessageActions();
 }
 
 void KMMainWidget::slotMessagePopup(const Akonadi::Item&msg ,const KUrl&aUrl,const KUrl &imageUrl,const QPoint& aPoint)
 {
     updateMessageMenu();
 
     const QString email =  KPIMUtils::firstEmailAddress( aUrl.path() ).toLower();
     if ( aUrl.protocol() == QLatin1String("mailto") && !email.isEmpty()) {
         Akonadi::ContactSearchJob *job = new Akonadi::ContactSearchJob( this );
         job->setLimit( 1 );
         job->setQuery( Akonadi::ContactSearchJob::Email, email, Akonadi::ContactSearchJob::ExactMatch );
         job->setProperty( "msg", QVariant::fromValue( msg ) );
         job->setProperty( "point", aPoint );
         job->setProperty( "imageUrl", imageUrl );
         job->setProperty( "url", aUrl );
         connect( job, SIGNAL(result(KJob*)), SLOT(slotContactSearchJobForMessagePopupDone(KJob*)) );
     } else {
         showMessagePopup(msg, aUrl, imageUrl, aPoint, false, false);
     }
 }
 
 void KMMainWidget::slotContactSearchJobForMessagePopupDone( KJob *job )
 {
     const Akonadi::ContactSearchJob *searchJob = qobject_cast<Akonadi::ContactSearchJob*>( job );
     const bool contactAlreadyExists = !searchJob->contacts().isEmpty();
 
     const QList<Akonadi::Item> listContact = searchJob->items();
     const bool uniqueContactFound = (listContact.count() == 1);
     if (uniqueContactFound) {
         mMsgView->setContactItem(listContact.first(), searchJob->contacts().at(0));
     } else {
         mMsgView->clearContactItem();
     }
     const Akonadi::Item msg = job->property( "msg" ).value<Akonadi::Item>();
     const QPoint aPoint = job->property( "point" ).toPoint();
     const KUrl imageUrl = job->property("imageUrl").value<KUrl>();
     const KUrl url = job->property( "url" ).value<KUrl>();
 
     showMessagePopup(msg, url, imageUrl, aPoint, contactAlreadyExists, uniqueContactFound);
 }
 
 void KMMainWidget::showMessagePopup(const Akonadi::Item&msg ,const KUrl&url,const KUrl &imageUrl,const QPoint& aPoint, bool contactAlreadyExists, bool uniqueContactFound)
 {
     KMenu *menu = new KMenu;
 
     bool urlMenuAdded = false;
 
     if ( !url.isEmpty() ) {
         if ( url.protocol() == QLatin1String( "mailto" ) ) {
             // popup on a mailto URL
             menu->addAction( mMsgView->mailToComposeAction() );
             menu->addAction( mMsgView->mailToReplyAction() );
             menu->addAction( mMsgView->mailToForwardAction() );
 
             menu->addSeparator();
 
             if ( contactAlreadyExists ) {
                 if (uniqueContactFound) {
                     menu->addAction( mMsgView->editContactAction() );
                 } else {
                     menu->addAction( mMsgView->openAddrBookAction() );
                 }
             } else {
                 menu->addAction( mMsgView->addAddrBookAction() );
                 menu->addAction( mMsgView->addToExistingContactAction() );
             }
             menu->addSeparator();
             menu->addMenu(mMsgView->viewHtmlOption());
             menu->addSeparator();
             menu->addAction( mMsgView->copyURLAction() );
             urlMenuAdded = true;
         } else if ( url.protocol() != QLatin1String( "attachment" ) ) {
             // popup on a not-mailto URL
             menu->addAction( mMsgView->urlOpenAction() );
             menu->addAction( mMsgView->addBookmarksAction() );
             menu->addAction( mMsgView->urlSaveAsAction() );
             menu->addAction( mMsgView->copyURLAction() );
             if (mMsgView->isAShortUrl(url)) {
                 menu->addSeparator();
                 menu->addAction( mMsgView->expandShortUrlAction() );
             }
             if (!imageUrl.isEmpty()) {
                 menu->addSeparator();
                 menu->addAction( mMsgView->copyImageLocation());
                 menu->addAction( mMsgView->downloadImageToDiskAction());
                 menu->addAction( mMsgView->shareImage());
                 if (mMsgView->adblockEnabled()) {
                     menu->addSeparator();
                     menu->addAction( mMsgView->blockImage());
                 }
             }
             urlMenuAdded = true;
         }
         kDebug() << "URL is:" << url;
     }
     const QString selectedText = mMsgView ? mMsgView->copyText() : QString();
     if ( mMsgView && !selectedText.isEmpty() ) {
         if ( urlMenuAdded ) {
             menu->addSeparator();
         }
         menu->addAction( mMsgActions->replyMenu() );
         menu->addSeparator();
 
         menu->addAction( mMsgView->copyAction() );
         menu->addAction( mMsgView->selectAllAction() );
         menu->addSeparator();
         mMsgActions->addWebShortcutsMenu(menu,selectedText);
         menu->addSeparator();
         menu->addAction(mMsgView->translateAction());
         menu->addSeparator();
         menu->addAction( mMsgView->speakTextAction());
     } else if ( !urlMenuAdded ) {
         // popup somewhere else (i.e., not a URL) on the message
         if (!mMessagePane->currentMessage()) {
             // no messages
             delete menu;
             return;
         }
         Akonadi::Collection parentCol = msg.parentCollection();
         if ( parentCol.isValid() && CommonKernel->folderIsTemplates( parentCol) ) {
             menu->addAction( mUseAction );
         } else {
             menu->addAction( mMsgActions->replyMenu() );
             menu->addAction( mMsgActions->forwardMenu() );
         }
         if ( parentCol.isValid() && CommonKernel->folderIsSentMailFolder( parentCol ) ) {
             menu->addAction( sendAgainAction() );
         } else {
             menu->addAction( editAction() );
         }
         menu->addAction( mailingListActionMenu() );
         menu->addSeparator();
 
         menu->addAction( mCopyActionMenu );
         menu->addAction( mMoveActionMenu );
 
         menu->addSeparator();
 
         menu->addAction( mMsgActions->messageStatusMenu() );
         menu->addSeparator();
         if ( mMsgView ) {
             if (!imageUrl.isEmpty()) {
                 menu->addSeparator();
                 menu->addAction( mMsgView->copyImageLocation());
                 menu->addAction( mMsgView->downloadImageToDiskAction());
                 menu->addAction( mMsgView->shareImage());
                 menu->addSeparator();
                 if (mMsgView->adblockEnabled()) {
                     menu->addAction( mMsgView->blockImage() );
                     menu->addSeparator();
                 }
             }
             menu->addAction( mMsgView->viewSourceAction() );
             menu->addAction( mMsgView->toggleFixFontAction() );
             menu->addAction( mMsgView->toggleMimePartTreeAction() );
         }
         menu->addSeparator();
         menu->addAction( mMsgActions->printPreviewAction() );
         menu->addAction( mMsgActions->printAction() );
         menu->addAction( mSaveAsAction );
         menu->addAction( mSaveAttachmentsAction );
         menu->addSeparator();
         if ( parentCol.isValid() && CommonKernel->folderIsTrash(parentCol) ) {
             menu->addAction( mDeleteAction );
         } else {
             menu->addAction( akonadiStandardAction( Akonadi::StandardMailActionManager::MoveToTrash ) );
         }
         menu->addSeparator();
         menu->addAction( mMsgView->createTodoAction() );
         menu->addAction( mMsgView->createEventAction() );
         menu->addAction( mMsgView->createNoteAction() );
         menu->addSeparator();
+
         if (mMsgView) {
             menu->addAction( mMsgView->saveMessageDisplayFormatAction() );
             menu->addAction( mMsgView->resetMessageDisplayFormatAction() );
             menu->addSeparator();
         }
-        menu->addAction( mMsgActions->annotateAction() );
+
         if (mMsgView && mMsgView->adblockEnabled()) {
             menu->addSeparator();
             menu->addAction( mMsgView->openBlockableItems());
         }
     }
     KAcceleratorManager::manage(menu);
     menu->exec( aPoint, 0 );
     delete menu;
 }
 //-----------------------------------------------------------------------------
 void KMMainWidget::getAccountMenu()
 {
     mActMenu->clear();
     const Akonadi::AgentInstance::List lst = MailCommon::Util::agentInstances();
     foreach ( const Akonadi::AgentInstance& type, lst )
     {
         // Explicitly make a copy, as we're not changing values of the list but only
         // the local copy which is passed to action.
         QAction* action = mActMenu->addAction( QString( type.name() ).replace(QLatin1Char('&'), QLatin1String("&&")) );
         action->setData( type.identifier() );
     }
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::getTransportMenu()
 {
 
     mSendMenu->clear();
     QStringList availTransports = MailTransport::TransportManager::self()->transportNames();
     QStringList::Iterator it;
     QStringList::Iterator end( availTransports.end() );
 
     for (it = availTransports.begin(); it != end ; ++it)
         mSendMenu->addAction((*it).replace(QLatin1Char('&'), QLatin1String("&&")));
 }
 
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::setupActions()
 {
     mMsgActions = new KMail::MessageActions( actionCollection(), this );
     mMsgActions->setMessageView( mMsgView );
 
     //----- File Menu
     mSaveAsAction = new KAction(KIcon(QLatin1String("document-save")), i18n("Save &As..."), this);
     actionCollection()->addAction(QLatin1String("file_save_as"), mSaveAsAction );
     connect(mSaveAsAction, SIGNAL(triggered(bool)), SLOT(slotSaveMsg()));
     mSaveAsAction->setShortcut(KStandardShortcut::save());
 
     mOpenAction = KStandardAction::open( this, SLOT(slotOpenMsg()),
                                          actionCollection() );
 
     mOpenRecentAction = KStandardAction::openRecent( this, SLOT(slotOpenRecentMsg(KUrl)),
                                                      actionCollection() );
     KConfigGroup grp = mConfig->group(QLatin1String("Recent Files"));
     mOpenRecentAction->loadEntries(grp);
 
     {
         KAction *action = new KAction(i18n("&Expire All Folders"), this);
         actionCollection()->addAction(QLatin1String("expire_all_folders"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotExpireAll()));
     }
     {
         KAction *action = new KAction(KIcon(QLatin1String("mail-receive")), i18n("Check &Mail"), this);
         actionCollection()->addAction(QLatin1String("check_mail"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotCheckMail()));
         action->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_L));
     }
 
     KActionMenu *actActionMenu = new KActionMenu(KIcon(QLatin1String("mail-receive")), i18n("Check Mail In"), this);
     actActionMenu->setIconText( i18n("Check Mail") );
     actActionMenu->setToolTip( i18n("Check Mail") );
     actionCollection()->addAction(QLatin1String("check_mail_in"), actActionMenu );
     actActionMenu->setDelayed(true); //needed for checking "all accounts"
     connect(actActionMenu, SIGNAL(triggered(bool)), this, SLOT(slotCheckMail()));
     mActMenu = actActionMenu->menu();
     connect(mActMenu, SIGNAL(triggered(QAction*)),
             SLOT(slotCheckOneAccount(QAction*)));
     connect(mActMenu, SIGNAL(aboutToShow()), SLOT(getAccountMenu()));
 
     mSendQueued = new KAction(KIcon(QLatin1String("mail-send")), i18n("&Send Queued Messages"), this);
     actionCollection()->addAction(QLatin1String("send_queued"), mSendQueued );
     connect(mSendQueued, SIGNAL(triggered(bool)), SLOT(slotSendQueued()));
     {
 
         KAction * action = mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::ToggleWorkOffline );
         mAkonadiStandardActionManager->interceptAction( Akonadi::StandardActionManager::ToggleWorkOffline );
         action->setCheckable(false);
         connect( action, SIGNAL(triggered(bool)), this, SLOT(slotOnlineStatus()) );
         action->setText( i18n("Online status (unknown)") );
     }
 
     mSendActionMenu = new KActionMenu(KIcon(QLatin1String("mail-send-via")), i18n("Send Queued Messages Via"), this);
     actionCollection()->addAction(QLatin1String("send_queued_via"), mSendActionMenu );
     mSendActionMenu->setDelayed(true);
 
     mSendMenu = mSendActionMenu->menu();
     connect(mSendMenu,SIGNAL(triggered(QAction*)), SLOT(slotSendQueuedVia(QAction*)));
     connect(mSendMenu,SIGNAL(aboutToShow()),SLOT(getTransportMenu()));
 
     //----- Tools menu
     if (parent()->inherits("KMMainWin")) {
         KAction *action = new KAction(KIcon(QLatin1String("x-office-address-book")), i18n("&Address Book"), this);
         actionCollection()->addAction(QLatin1String("addressbook"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotAddrBook()));
         if (KStandardDirs::findExe(QLatin1String("kaddressbook")).isEmpty())
             action->setEnabled(false);
     }
 
     {
         KAction *action = new KAction(KIcon(QLatin1String("pgp-keys")), i18n("Certificate Manager"), this);
         actionCollection()->addAction(QLatin1String("tools_start_certman"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotStartCertManager()));
         // disable action if no certman binary is around
         if (KStandardDirs::findExe(QLatin1String("kleopatra")).isEmpty())
             action->setEnabled(false);
     }
     {
         KAction *action = new KAction(KIcon(QLatin1String("pgp-keys")), i18n("GnuPG Log Viewer"), this);
         actionCollection()->addAction(QLatin1String("tools_start_kwatchgnupg"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotStartWatchGnuPG()));
 #ifdef Q_OS_WIN32
         // not ported yet, underlying infrastructure missing on Windows
         const bool usableKWatchGnupg = false;
 #else
         // disable action if no kwatchgnupg binary is around
         bool usableKWatchGnupg = !KStandardDirs::findExe(QLatin1String("kwatchgnupg")).isEmpty();
 #endif
         action->setEnabled(usableKWatchGnupg);
     }
     {
         KAction *action = new KAction(KIcon(QLatin1String("document-import")), i18n("&Import Messages..."), this);
         actionCollection()->addAction(QLatin1String("import"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotImport()));
         if (KStandardDirs::findExe(QLatin1String("kmailcvt")).isEmpty()) action->setEnabled(false);
     }
 
 #if !defined(NDEBUG)
     {
         KAction *action = new KAction(i18n("&Debug Sieve..."), this);
         actionCollection()->addAction(QLatin1String("tools_debug_sieve"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotDebugSieve()));
     }
 #endif
 
     {
         KAction *action = new KAction(i18n("Filter &Log Viewer..."), this);
         actionCollection()->addAction(QLatin1String("filter_log_viewer"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotFilterLogViewer()));
     }
     {
         KAction *action = new KAction(i18n("&Anti-Spam Wizard..."), this);
         actionCollection()->addAction(QLatin1String("antiSpamWizard"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotAntiSpamWizard()));
     }
     {
         KAction *action = new KAction(i18n("&Anti-Virus Wizard..."), this);
         actionCollection()->addAction(QLatin1String("antiVirusWizard"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotAntiVirusWizard()));
     }
     {
         KAction *action = new KAction( i18n("&Account Wizard..."), this );
         actionCollection()->addAction( QLatin1String("accountWizard"), action );
         connect( action, SIGNAL(triggered(bool)), SLOT(slotAccountWizard()) );
     }
     {
         KAction *action = new KAction( i18n("&Import Wizard..."), this );
         actionCollection()->addAction( QLatin1String("importWizard"), action );
         connect( action, SIGNAL(triggered(bool)), SLOT(slotImportWizard()) );
     }
     if ( KSieveUi::Util::allowOutOfOfficeSettings() )
     {
         KAction *action = new KAction( i18n("Edit \"Out of Office\" Replies..."), this );
         actionCollection()->addAction( QLatin1String("tools_edit_vacation"), action );
         connect( action, SIGNAL(triggered(bool)), SLOT(slotEditVacation()) );
     }
 
     {
         KAction *action = new KAction(i18n("&Configure Automatic Archiving..."), this);
         actionCollection()->addAction(QLatin1String("tools_automatic_archiving"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotConfigureAutomaticArchiving()));
     }
 
     {
         KAction *action = new KAction(i18n("Message Delayed..."), this);
         actionCollection()->addAction(QLatin1String("message_delayed"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotConfigureSendLater()));
     }
 
 
     // Disable the standard action delete key sortcut.
     KAction* const standardDelAction = akonadiStandardAction(  Akonadi::StandardActionManager::DeleteItems );
     standardDelAction->setShortcut( QKeySequence() );
 
     //----- Edit Menu
 
     /* The delete action is nowhere in the gui, by default, so we need to make
    * sure it is plugged into the KAccel now, since that won't happen on
    * XMLGui construction or manual ->plug(). This is only a problem when run
    * as a part, though. */
     mDeleteAction = new KAction(KIcon(QLatin1String("edit-delete")), i18nc("@action Hard delete, bypassing trash", "&Delete"), this);
     actionCollection()->addAction(QLatin1String("delete"), mDeleteAction );
     connect(mDeleteAction, SIGNAL(triggered(bool)), SLOT(slotDeleteMsg()));
     mDeleteAction->setShortcut(QKeySequence(Qt::SHIFT+Qt::Key_Delete));
 
     mTrashThreadAction = new KAction(i18n("M&ove Thread to Trash"), this);
     actionCollection()->addAction(QLatin1String("move_thread_to_trash"), mTrashThreadAction );
     mTrashThreadAction->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_Delete));
     mTrashThreadAction->setIcon(KIcon(QLatin1String("user-trash")));
     mTrashThreadAction->setHelpText(i18n("Move thread to trashcan") );
     connect(mTrashThreadAction, SIGNAL(triggered(bool)), SLOT(slotTrashThread()));
 
     mDeleteThreadAction = new KAction(KIcon(QLatin1String("edit-delete")), i18n("Delete T&hread"), this);
     actionCollection()->addAction(QLatin1String("delete_thread"), mDeleteThreadAction );
     connect(mDeleteThreadAction, SIGNAL(triggered(bool)), SLOT(slotDeleteThread()));
     mDeleteThreadAction->setShortcut(QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_Delete));
 
     {
         KAction *action = new KAction(KIcon(QLatin1String("edit-find-mail")), i18n("&Find Messages..."), this);
         actionCollection()->addAction(QLatin1String("search_messages"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotRequestFullSearchFromQuickSearch()));
         action->setShortcut(QKeySequence(Qt::Key_S));
     }
     {
         KAction *action = new KAction(i18n("Select &All Messages"), this);
         actionCollection()->addAction(QLatin1String("mark_all_messages"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotMarkAll()));
         action->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_A ) );
     }
 
     //----- Folder Menu
 
     mFolderMailingListPropertiesAction = new KAction(i18n("&Mailing List Management..."), this);
     actionCollection()->addAction(QLatin1String("folder_mailinglist_properties"), mFolderMailingListPropertiesAction );
     connect(mFolderMailingListPropertiesAction, SIGNAL(triggered(bool)), SLOT(slotFolderMailingListProperties()));
     // mFolderMailingListPropertiesAction->setIcon(KIcon("document-properties-mailing-list"));
 
     mShowFolderShortcutDialogAction = new KAction(KIcon(QLatin1String("configure-shortcuts")), i18n("&Assign Shortcut..."), this);
     actionCollection()->addAction(QLatin1String("folder_shortcut_command"), mShowFolderShortcutDialogAction );
     connect( mShowFolderShortcutDialogAction, SIGNAL(triggered(bool)),
              SLOT(slotShowFolderShortcutDialog()) );
 
     // FIXME: this action is not currently enabled in the rc file, but even if
     // it were there is inconsistency between the action name and action.
     // "Expiration Settings" implies that this will lead to a settings dialogue
     // and it should be followed by a "...", but slotExpireFolder() performs
     // an immediate expiry.
     //
     // TODO: expire action should be disabled if there is no content or if
     // the folder can't delete messages.
     //
     // Leaving the action here for the moment, it and the "Expire" option in the
     // folder popup menu should be combined or at least made consistent.  Same for
     // slotExpireFolder() and FolderViewItem::slotShowExpiryProperties().
     mExpireFolderAction = new KAction(i18n("&Expiration Settings"), this);
     actionCollection()->addAction(QLatin1String("expire"), mExpireFolderAction );
     connect(mExpireFolderAction, SIGNAL(triggered(bool)), SLOT(slotExpireFolder()));
 
 
     mAkonadiStandardActionManager->interceptAction( Akonadi::StandardMailActionManager::MoveToTrash );
     connect( mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::MoveToTrash ), SIGNAL(triggered(bool)), this, SLOT(slotTrashSelectedMessages()) );
 
 
     mAkonadiStandardActionManager->interceptAction( Akonadi::StandardMailActionManager::MoveAllToTrash );
     connect( mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::MoveAllToTrash ), SIGNAL(triggered(bool)), this, SLOT(slotEmptyFolder()) );
 
     mAkonadiStandardActionManager->interceptAction( Akonadi::StandardActionManager::DeleteCollections );
     connect( mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::DeleteCollections ), SIGNAL(triggered(bool)), this, SLOT(slotRemoveFolder()) );
 
     // ### PORT ME: Add this to the context menu. Not possible right now because
     //              the context menu uses XMLGUI, and that would add the entry to
     //              all collection context menus
     mArchiveFolderAction = new KAction( i18n( "&Archive Folder..." ), this );
     actionCollection()->addAction( QLatin1String("archive_folder"), mArchiveFolderAction );
     connect( mArchiveFolderAction, SIGNAL(triggered(bool)), SLOT(slotArchiveFolder()) );
 
     mPreferHtmlAction = new KToggleAction(i18n("Prefer &HTML to Plain Text"), this);
     actionCollection()->addAction(QLatin1String("prefer_html"), mPreferHtmlAction );
     connect(mPreferHtmlAction, SIGNAL(triggered(bool)), SLOT(slotOverrideHtml()));
 
     mPreferHtmlLoadExtAction = new KToggleAction(i18n("Load E&xternal References"), this);
     actionCollection()->addAction(QLatin1String("prefer_html_external_refs"), mPreferHtmlLoadExtAction );
     connect(mPreferHtmlLoadExtAction, SIGNAL(triggered(bool)), SLOT(slotOverrideHtmlLoadExt()));
 
     {
         KAction *action =  mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::CopyCollections);
         action->setShortcut(QKeySequence(Qt::SHIFT+Qt::CTRL+Qt::Key_C));
     }
     {
         KAction *action = mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::Paste);
         action->setShortcut(QKeySequence(Qt::SHIFT+Qt::CTRL+Qt::Key_V));
     }
     {
         KAction *action = mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::CopyItems);
         action->setShortcut(QKeySequence(Qt::ALT+Qt::CTRL+Qt::Key_C));
     }
     {
         KAction *action = mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::CutItems );
         action->setShortcut(QKeySequence(Qt::ALT+Qt::CTRL+Qt::Key_X));
     }
 
     {
         KAction *action = mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::CopyItemToMenu );
         action->setText(i18n("Copy Message To...") );
         action = mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::MoveItemToMenu );
         action->setText(i18n("Move Message To...") );
     }
 
     //----- Message Menu
     {
         KAction *action = new KAction(KIcon(QLatin1String("mail-message-new")), i18n("&New Message..."), this);
         actionCollection()->addAction(QLatin1String("new_message"), action );
         action->setIconText( i18nc("@action:intoolbar New Empty Message", "New" ) );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotCompose()));
         // do not set a New shortcut if kmail is a component
         if ( !kmkernel->xmlGuiInstance().isValid() ) {
             action->setShortcut(KStandardShortcut::openNew());
         }
     }
 
     mTemplateMenu = new KActionMenu( KIcon( QLatin1String("document-new") ), i18n("Message From &Template"),
                                      actionCollection() );
     mTemplateMenu->setDelayed( true );
     actionCollection()->addAction(QLatin1String("new_from_template"), mTemplateMenu );
     connect( mTemplateMenu->menu(), SIGNAL(aboutToShow()), this,
              SLOT(slotShowNewFromTemplate()) );
     connect( mTemplateMenu->menu(), SIGNAL(triggered(QAction*)), this,
              SLOT(slotNewFromTemplate(QAction*)) );
 
     mMessageNewList = new KAction( KIcon( QLatin1String("mail-message-new-list") ),
                                    i18n( "New Message t&o Mailing-List..." ),
                                    this );
     actionCollection()->addAction(QLatin1String("post_message"),  mMessageNewList);
     connect( mMessageNewList, SIGNAL(triggered(bool)),
              SLOT(slotPostToML()) );
     mMessageNewList->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_N ) );
 
     mSendAgainAction = new KAction(i18n("Send A&gain..."), this);
     actionCollection()->addAction(QLatin1String("send_again"), mSendAgainAction );
     connect(mSendAgainAction, SIGNAL(triggered(bool)), SLOT(slotResendMsg()));
 
     //----- Create filter actions
     mFilterMenu = new KActionMenu(KIcon(QLatin1String("view-filter")), i18n("&Create Filter"), this);
     actionCollection()->addAction(QLatin1String("create_filter"), mFilterMenu );
     connect( mFilterMenu, SIGNAL(triggered(bool)), this,
              SLOT(slotFilter()) );
     {
         KAction *action = new KAction(i18n("Filter on &Subject..."), this);
         actionCollection()->addAction(QLatin1String("subject_filter"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotSubjectFilter()));
         mFilterMenu->addAction( action );
     }
 
     {
         KAction *action = new KAction(i18n("Filter on &From..."), this);
         actionCollection()->addAction(QLatin1String("from_filter"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotFromFilter()));
         mFilterMenu->addAction( action );
     }
     {
         KAction *action = new KAction(i18n("Filter on &To..."), this);
         actionCollection()->addAction(QLatin1String("to_filter"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotToFilter()));
         mFilterMenu->addAction( action );
     }
     mFilterMenu->addAction( mMsgActions->listFilterAction() );
 
     mUseAction = new KAction( KIcon(QLatin1String("document-new")), i18n("New Message From &Template"), this );
     actionCollection()->addAction(QLatin1String("use_template"), mUseAction);
     connect(mUseAction, SIGNAL(triggered(bool)), SLOT(slotUseTemplate()));
     mUseAction->setShortcut(QKeySequence(Qt::SHIFT + Qt::Key_N));
 
     //----- "Mark Thread" submenu
     mThreadStatusMenu = new KActionMenu(i18n("Mark &Thread"), this);
     actionCollection()->addAction(QLatin1String("thread_status"), mThreadStatusMenu );
 
     mMarkThreadAsReadAction = new KAction(KIcon(QLatin1String("mail-mark-read")), i18n("Mark Thread as &Read"), this);
     actionCollection()->addAction(QLatin1String("thread_read"), mMarkThreadAsReadAction );
     connect(mMarkThreadAsReadAction, SIGNAL(triggered(bool)), SLOT(slotSetThreadStatusRead()));
     mMarkThreadAsReadAction->setHelpText(i18n("Mark all messages in the selected thread as read"));
     mThreadStatusMenu->addAction( mMarkThreadAsReadAction );
 
     mMarkThreadAsUnreadAction = new KAction(KIcon(QLatin1String("mail-mark-unread")), i18n("Mark Thread as &Unread"), this);
     actionCollection()->addAction(QLatin1String("thread_unread"), mMarkThreadAsUnreadAction );
     connect(mMarkThreadAsUnreadAction, SIGNAL(triggered(bool)), SLOT(slotSetThreadStatusUnread()));
     mMarkThreadAsUnreadAction->setHelpText(i18n("Mark all messages in the selected thread as unread"));
     mThreadStatusMenu->addAction( mMarkThreadAsUnreadAction );
 
     mThreadStatusMenu->addSeparator();
 
     //----- "Mark Thread" toggle actions
     mToggleThreadImportantAction = new KToggleAction(KIcon(QLatin1String("mail-mark-important")), i18n("Mark Thread as &Important"), this);
     actionCollection()->addAction(QLatin1String("thread_flag"), mToggleThreadImportantAction );
     connect(mToggleThreadImportantAction, SIGNAL(triggered(bool)), SLOT(slotSetThreadStatusImportant()));
     mToggleThreadImportantAction->setCheckedState( KGuiItem(i18n("Remove &Important Thread Mark")) );
     mThreadStatusMenu->addAction( mToggleThreadImportantAction );
 
     mToggleThreadToActAction = new KToggleAction(KIcon(QLatin1String("mail-mark-task")), i18n("Mark Thread as &Action Item"), this);
     actionCollection()->addAction(QLatin1String("thread_toact"), mToggleThreadToActAction );
     connect(mToggleThreadToActAction, SIGNAL(triggered(bool)), SLOT(slotSetThreadStatusToAct()));
     mToggleThreadToActAction->setCheckedState( KGuiItem(i18n("Remove &Action Item Thread Mark")) );
     mThreadStatusMenu->addAction( mToggleThreadToActAction );
 
     //------- "Watch and ignore thread" actions
     mWatchThreadAction = new KToggleAction(KIcon(QLatin1String("mail-thread-watch")), i18n("&Watch Thread"), this);
     actionCollection()->addAction(QLatin1String("thread_watched"), mWatchThreadAction );
     connect(mWatchThreadAction, SIGNAL(triggered(bool)), SLOT(slotSetThreadStatusWatched()));
 
     mIgnoreThreadAction = new KToggleAction(KIcon(QLatin1String("mail-thread-ignored")), i18n("&Ignore Thread"), this);
     actionCollection()->addAction(QLatin1String("thread_ignored"), mIgnoreThreadAction );
     connect(mIgnoreThreadAction, SIGNAL(triggered(bool)), SLOT(slotSetThreadStatusIgnored()));
 
     mThreadStatusMenu->addSeparator();
     mThreadStatusMenu->addAction( mWatchThreadAction );
     mThreadStatusMenu->addAction( mIgnoreThreadAction );
 
     mSaveAttachmentsAction = new KAction(KIcon(QLatin1String("mail-attachment")), i18n("Save A&ttachments..."), this);
     actionCollection()->addAction(QLatin1String("file_save_attachments"), mSaveAttachmentsAction );
     connect(mSaveAttachmentsAction, SIGNAL(triggered(bool)), SLOT(slotSaveAttachments()));
 
     mMoveActionMenu = mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::MoveItemToMenu);
 
     mCopyActionMenu = mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::CopyItemToMenu);
 
     mApplyAllFiltersAction =
             new KAction( KIcon( QLatin1String("view-filter") ), i18n( "Appl&y All Filters" ), this );
     actionCollection()->addAction( QLatin1String("apply_filters"), mApplyAllFiltersAction );
     connect( mApplyAllFiltersAction, SIGNAL(triggered(bool)),
              SLOT(slotApplyFilters()) );
     mApplyAllFiltersAction->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_J ) );
 
     mApplyFilterActionsMenu = new KActionMenu( i18n( "A&pply Filter" ), this );
     actionCollection()->addAction( QLatin1String("apply_filter_actions"), mApplyFilterActionsMenu );
 
     {
         KAction *action = new KAction(i18nc("View->","&Expand Thread / Group"), this);
         actionCollection()->addAction(QLatin1String("expand_thread"), action );
         action->setShortcut(QKeySequence(Qt::Key_Period));
         action->setHelpText(i18n("Expand the current thread or group"));
         connect(action, SIGNAL(triggered(bool)), SLOT(slotExpandThread()));
     }
     {
         KAction *action = new KAction(i18nc("View->","&Collapse Thread / Group"), this);
         actionCollection()->addAction(QLatin1String("collapse_thread"), action );
         action->setShortcut(QKeySequence(Qt::Key_Comma));
         action->setHelpText( i18n("Collapse the current thread or group"));
         connect(action, SIGNAL(triggered(bool)), SLOT(slotCollapseThread()));
     }
     {
         KAction *action = new KAction(i18nc("View->","Ex&pand All Threads"), this);
         actionCollection()->addAction(QLatin1String("expand_all_threads"), action );
         action->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_Period));
         action->setHelpText( i18n("Expand all threads in the current folder"));
         connect(action, SIGNAL(triggered(bool)), SLOT(slotExpandAllThreads()));
     }
     {
         KAction *action = new KAction(i18nc("View->","C&ollapse All Threads"), this);
         actionCollection()->addAction(QLatin1String("collapse_all_threads"), action );
         action->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_Comma));
         action->setHelpText( i18n("Collapse all threads in the current folder"));
         connect(action, SIGNAL(triggered(bool)), SLOT(slotCollapseAllThreads()));
     }
 
 
     KAction *dukeOfMonmoth = new KAction(i18n("&Display Message"), this);
     actionCollection()->addAction(QLatin1String("display_message"), dukeOfMonmoth );
     connect(dukeOfMonmoth, SIGNAL(triggered(bool)), SLOT(slotDisplayCurrentMessage()));
     KShortcut shortcut = KShortcut(QKeySequence( Qt::Key_Enter ));
     shortcut.setAlternate( QKeySequence( Qt::Key_Return ) );
     dukeOfMonmoth->setShortcuts( shortcut );
 
     //----- Go Menu
     {
         KAction *action = new KAction(i18n("&Next Message"), this);
         actionCollection()->addAction(QLatin1String("go_next_message"), action );
         action->setShortcuts(KShortcut( QLatin1String("N; Right") ));
         action->setHelpText(i18n("Go to the next message"));
         connect(action, SIGNAL(triggered(bool)), SLOT(slotSelectNextMessage()));
     }
     {
         KAction *action = new KAction(i18n("Next &Unread Message"), this);
         actionCollection()->addAction(QLatin1String("go_next_unread_message"), action );
         action->setShortcut(QKeySequence(Qt::Key_Plus));
         if ( QApplication::isRightToLeft() ) {
             action->setIcon( KIcon( QLatin1String("go-previous") ) );
         } else {
             action->setIcon( KIcon( QLatin1String("go-next") ) );
         }
         action->setIconText( i18nc( "@action:inmenu Goto next unread message", "Next" ) );
         action->setHelpText(i18n("Go to the next unread message"));
         connect(action, SIGNAL(triggered(bool)), SLOT(slotSelectNextUnreadMessage()));
     }
     {
         KAction *action = new KAction(i18n("&Previous Message"), this);
         actionCollection()->addAction(QLatin1String("go_prev_message"), action );
         action->setHelpText(i18n("Go to the previous message"));
         action->setShortcuts(KShortcut( QLatin1String("P; Left") ));
         connect(action, SIGNAL(triggered(bool)), SLOT(slotSelectPreviousMessage()));
     }
     {
         KAction *action = new KAction(i18n("Previous Unread &Message"), this);
         actionCollection()->addAction(QLatin1String("go_prev_unread_message"), action );
         action->setShortcut(QKeySequence(Qt::Key_Minus));
         if ( QApplication::isRightToLeft() ) {
             action->setIcon( KIcon( QLatin1String("go-next") ) );
         } else {
             action->setIcon( KIcon( QLatin1String("go-previous") ) );
         }
         action->setIconText( i18nc( "@action:inmenu Goto previous unread message.","Previous" ) );
         action->setHelpText(i18n("Go to the previous unread message"));
         connect(action, SIGNAL(triggered(bool)), SLOT(slotSelectPreviousUnreadMessage()));
     }
     {
         KAction *action = new KAction(i18n("Next Unread &Folder"), this);
         actionCollection()->addAction(QLatin1String("go_next_unread_folder"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotNextUnreadFolder()));
         action->setShortcut(QKeySequence(Qt::ALT+Qt::Key_Plus));
         action->setHelpText(i18n("Go to the next folder with unread messages"));
     }
     {
         KAction *action = new KAction(i18n("Previous Unread F&older"), this);
         actionCollection()->addAction(QLatin1String("go_prev_unread_folder"), action );
         action->setShortcut(QKeySequence(Qt::ALT+Qt::Key_Minus));
         action->setHelpText(i18n("Go to the previous folder with unread messages"));
         connect(action, SIGNAL(triggered(bool)), SLOT(slotPrevUnreadFolder()));
     }
     {
         KAction *action = new KAction(i18nc("Go->","Next Unread &Text"), this);
         actionCollection()->addAction(QLatin1String("go_next_unread_text"), action );
         action->setShortcut(QKeySequence(Qt::Key_Space));
         action->setHelpText(i18n("Go to the next unread text"));
         action->setWhatsThis( i18n("Scroll down current message. "
                                    "If at end of current message, "
                                    "go to next unread message."));
         connect(action, SIGNAL(triggered(bool)), SLOT(slotReadOn()));
     }
 
     //----- Settings Menu
     {
         KAction *action = new KAction(i18n("Configure &Filters..."), this);
         action->setMenuRole( QAction::NoRole ); // do not move to application menu on OS X
         actionCollection()->addAction(QLatin1String("filter"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotFilter()));
     }
     {
         KAction *action = new KAction(i18n("Manage &Sieve Scripts..."), this);
         actionCollection()->addAction(QLatin1String("sieveFilters"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotManageSieveScripts()));
     }
     {
         KAction *action = new KAction(KIcon(QLatin1String("kmail")), i18n("KMail &Introduction"), this);
         actionCollection()->addAction(QLatin1String("help_kmail_welcomepage"), action );
         action->setHelpText( i18n("Display KMail's Welcome Page") );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotIntro()));
     }
 
     // ----- Standard Actions
 
     //  KStandardAction::configureNotifications(this, SLOT(slotEditNotifications()), actionCollection());
     {
         KAction *action = new KAction( KIcon(QLatin1String("preferences-desktop-notification")),
                                        i18n("Configure &Notifications..."), this );
         action->setMenuRole( QAction::NoRole ); // do not move to application menu on OS X
         actionCollection()->addAction( QLatin1String("kmail_configure_notifications"), action );
         connect(action, SIGNAL(triggered(bool)), SLOT(slotEditNotifications()));
     }
 
     {
         KAction *action = new KAction(KIcon(QLatin1String("configure")), i18n("&Configure KMail..."), this);
         actionCollection()->addAction(QLatin1String("kmail_configure_kmail"), action );
         connect(action, SIGNAL(triggered(bool)), kmkernel, SLOT(slotShowConfigurationDialog()));
     }
 
     {
         mExpireConfigAction = new KAction( i18n( "Expire..." ), this );
         actionCollection()->addAction( QLatin1String("expire_settings"),mExpireConfigAction );
         connect( mExpireConfigAction, SIGNAL(triggered(bool)), this, SLOT(slotShowExpiryProperties()) );
     }
 
     {
         KAction *action = new KAction( KIcon( QLatin1String("bookmark-new" )), i18n( "Add Favorite Folder..." ), this );
         actionCollection()->addAction( QLatin1String("add_favorite_folder"), action );
         connect( action, SIGNAL(triggered(bool)), this, SLOT(slotAddFavoriteFolder()) );
     }
 
     {
         mServerSideSubscription = new KAction( KIcon( QLatin1String("folder-bookmarks") ), i18n( "Serverside Subscription..." ), this);
         actionCollection()->addAction( QLatin1String("serverside_subscription"), mServerSideSubscription);
         connect( mServerSideSubscription, SIGNAL(triggered(bool)), this, SLOT(slotServerSideSubscription()) );
     }
 
 
     {
         mApplyFiltersOnFolder = new KAction( KIcon( QLatin1String("view-filter") ), i18n( "Appl&y All Filters On Folder" ), this );
         actionCollection()->addAction( QLatin1String("apply_filters_on_folder"), mApplyFiltersOnFolder );
         connect( mApplyFiltersOnFolder, SIGNAL(triggered(bool)),
                  SLOT(slotApplyFiltersOnFolder()) );
 
     }
 
     {
         KAction *action = new KAction(KIcon(QLatin1String("kmail")), i18n("&Export KMail Data..."), this);
         actionCollection()->addAction(QLatin1String("kmail_export_data"), action );
         connect(action, SIGNAL(triggered(bool)), this, SLOT(slotExportData()));
     }
 
     {
         KAction *action = new KAction(KIcon( QLatin1String( "contact-new" ) ),i18n("New AddressBook Contact..."),this);
         actionCollection()->addAction(QLatin1String("kmail_new_addressbook_contact"), action );
         connect(action, SIGNAL(triggered(bool)), this, SLOT(slotCreateAddressBookContact()));
 
 
     }
 
     actionCollection()->addAction(KStandardAction::Undo,  QLatin1String("kmail_undo"), this, SLOT(slotUndo()));
 
     KStandardAction::tipOfDay( this, SLOT(slotShowTip()), actionCollection() );
 
     menutimer = new QTimer( this );
     menutimer->setObjectName( QLatin1String("menutimer") );
     menutimer->setSingleShot( true );
     connect( menutimer, SIGNAL(timeout()), SLOT(updateMessageActionsDelayed()) );
     connect( kmkernel->undoStack(),
              SIGNAL(undoStackChanged()), this, SLOT(slotUpdateUndo()));
 
     updateMessageActions();
     updateFolderMenu();
     mTagActionManager = new KMail::TagActionManager( this, actionCollection(), mMsgActions,
                                                      mGUIClient );
     mFolderShortcutActionManager = new KMail::FolderShortcutActionManager( this, actionCollection() );
 
     {
         KAction *action = new KAction( i18n("Copy Message to Folder"), this );
         actionCollection()->addAction(QLatin1String( "copy_message_to_folder"), action );
         connect( action, SIGNAL(triggered(bool)),
                  SLOT(slotCopySelectedMessagesToFolder()) );
         action->setShortcut( QKeySequence( Qt::Key_C ) );
     }
     {
         KAction *action = new KAction( i18n("Jump to Folder..."), this );
         actionCollection()->addAction( QLatin1String("jump_to_folder"), action );
         connect( action, SIGNAL(triggered(bool)),
                  SLOT(slotJumpToFolder()) );
         action->setShortcut( QKeySequence( Qt::Key_J ) );
     }
     {
         KAction *action = new KAction(i18n("Abort Current Operation"), this);
         actionCollection()->addAction(QLatin1String("cancel"), action );
         connect( action, SIGNAL(triggered(bool)),
                  ProgressManager::instance(), SLOT(slotAbortAll()) );
         action->setShortcut( QKeySequence( Qt::Key_Escape ) );
     }
     {
         KAction *action = new KAction(i18n("Focus on Next Folder"), this);
         actionCollection()->addAction(QLatin1String("inc_current_folder"), action );
         connect( action, SIGNAL(triggered(bool)),
                  mFolderTreeWidget->folderTreeView(), SLOT(slotFocusNextFolder()) );
         action->setShortcut( QKeySequence( Qt::CTRL+Qt::Key_Right ) );
     }
     {
         KAction *action = new KAction(i18n("Focus on Previous Folder"), this);
         actionCollection()->addAction(QLatin1String("dec_current_folder"), action );
         connect( action, SIGNAL(triggered(bool)),
                  mFolderTreeWidget->folderTreeView(), SLOT(slotFocusPrevFolder()) );
         action->setShortcut( QKeySequence( Qt::CTRL+Qt::Key_Left ) );
     }
     {
         KAction *action = new KAction(i18n("Select Folder with Focus"), this);
         actionCollection()->addAction(QLatin1String("select_current_folder"), action );
 
         connect( action, SIGNAL(triggered(bool)),
                  mFolderTreeWidget->folderTreeView(), SLOT(slotSelectFocusFolder()) );
         action->setShortcut( QKeySequence( Qt::CTRL+Qt::Key_Space ) );
     }
     {
         KAction *action = new KAction(i18n("Focus on First Folder"), this);
         actionCollection()->addAction(QLatin1String("focus_first_folder"), action );
         connect( action, SIGNAL(triggered(bool)),
                  mFolderTreeWidget->folderTreeView(), SLOT(slotFocusFirstFolder()) );
         action->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_Home ) );
     }
     {
         KAction *action = new KAction(i18n("Focus on Last Folder"), this);
         actionCollection()->addAction(QLatin1String("focus_last_folder"), action );
         connect( action, SIGNAL(triggered(bool)),
                  mFolderTreeWidget->folderTreeView(), SLOT(slotFocusLastFolder()) );
         action->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_End ) );
     }
     {
         KAction *action = new KAction(i18n("Focus on Next Message"), this);
         actionCollection()->addAction(QLatin1String("inc_current_message"), action );
         connect( action, SIGNAL(triggered(bool)),
                  this, SLOT(slotFocusOnNextMessage()) );
         action->setShortcut( QKeySequence( Qt::ALT+Qt::Key_Right ) );
     }
     {
         KAction *action = new KAction(i18n("Focus on Previous Message"), this);
         actionCollection()->addAction(QLatin1String("dec_current_message"), action );
         connect( action, SIGNAL(triggered(bool)),
                  this, SLOT(slotFocusOnPrevMessage()) );
         action->setShortcut( QKeySequence( Qt::ALT+Qt::Key_Left ) );
     }
     {
         KAction *action = new KAction(i18n("Select First Message"), this);
         actionCollection()->addAction(QLatin1String("select_first_message"), action );
         connect ( action, SIGNAL(triggered(bool)),
                   this, SLOT(slotSelectFirstMessage()) );
         action->setShortcut( QKeySequence( Qt::ALT + Qt::Key_Home ) );
     }
     {
         KAction *action = new KAction(i18n("Select Last Message"), this);
         actionCollection()->addAction(QLatin1String("select_last_message"), action );
         connect ( action, SIGNAL(triggered(bool)),
                   this, SLOT(slotSelectLastMessage()) );
         action->setShortcut( QKeySequence( Qt::ALT + Qt::Key_End ) );
     }
     {
         KAction *action = new KAction(i18n("Select Message with Focus"), this);
         actionCollection()->addAction( QLatin1String("select_current_message"), action );
         connect( action, SIGNAL(triggered(bool)),
                  this, SLOT(slotSelectFocusedMessage()) );
         action->setShortcut( QKeySequence( Qt::ALT+Qt::Key_Space ) );
     }
 
     {
         mQuickSearchAction = new KAction( i18n("Set Focus to Quick Search"), this );
         //If change shortcut change Panel::setQuickSearchClickMessage(...) message
         mQuickSearchAction->setShortcut( QKeySequence( Qt::ALT + Qt::Key_Q ) );
         actionCollection()->addAction( QLatin1String("focus_to_quickseach"), mQuickSearchAction );
         connect( mQuickSearchAction, SIGNAL(triggered(bool)),
                  SLOT(slotFocusQuickSearch()) );
         updateQuickSearchLineText();
     }
     {
         KAction *action = new KAction( i18n( "Extend Selection to Previous Message" ), this );
         action->setShortcut( QKeySequence( Qt::SHIFT + Qt::Key_Left ) );
         actionCollection()->addAction( QLatin1String("previous_message"), action );
         connect( action, SIGNAL(triggered(bool)),
                  this, SLOT(slotExtendSelectionToPreviousMessage()) );
     }
     {
         KAction *action = new KAction( i18n( "Extend Selection to Next Message" ), this );
         action->setShortcut( QKeySequence( Qt::SHIFT + Qt::Key_Right ) );
         actionCollection()->addAction( QLatin1String("next_message"), action );
         connect( action, SIGNAL(triggered(bool)),
                  this, SLOT(slotExtendSelectionToNextMessage()) );
     }
 
     {
         mMoveMsgToFolderAction = new KAction( i18n("Move Message to Folder"), this );
         mMoveMsgToFolderAction->setShortcut( QKeySequence( Qt::Key_M ) );
         actionCollection()->addAction( QLatin1String("move_message_to_folder"), mMoveMsgToFolderAction );
         connect( mMoveMsgToFolderAction, SIGNAL(triggered(bool)),
                  SLOT(slotMoveSelectedMessageToFolder()) );
     }
 
     mArchiveAction = new KAction( i18nc("@action", "Archive"), this);
     actionCollection()->addAction( QLatin1String("archive_mails"), mArchiveAction );
     connect( mArchiveAction, SIGNAL(triggered(bool)),
              SLOT(slotArchiveMails()) );
 
 
 }
 
 void KMMainWidget::slotAddFavoriteFolder()
 {
     if (!mFavoritesModel)
         return;
     QPointer<MailCommon::FolderSelectionDialog> dialog( selectFromAllFoldersDialog() );
     dialog->setCaption( i18n("Add Favorite Folder") );
     if ( dialog->exec() && dialog ) {
         const Akonadi::Collection collection = dialog->selectedCollection();
         if ( collection.isValid() ) {
             mFavoritesModel->addCollection( collection );
         }
     }
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotEditNotifications()
 {
     KMail::KMKnotify notifyDlg( this );
     notifyDlg.exec();
 }
 
 void KMMainWidget::slotShowExpiryProperties()
 {
     showCollectionProperties( QLatin1String( "MailCommon::CollectionExpiryPage" ) );
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotReadOn()
 {
     if ( !mMsgView )
         return;
     if ( !mMsgView->viewer()->atBottom() ) {
         mMsgView->viewer()->slotJumpDown();
         return;
     }
     slotSelectNextUnreadMessage();
 }
 
 void KMMainWidget::slotNextUnreadFolder()
 {
     if ( !mFolderTreeWidget )
         return;
     mGoToFirstUnreadMessageInSelectedFolder = true;
     mFolderTreeWidget->folderTreeView()->selectNextUnreadFolder();
     mGoToFirstUnreadMessageInSelectedFolder = false;
 }
 
 void KMMainWidget::slotPrevUnreadFolder()
 {
     if ( !mFolderTreeWidget )
         return;
     mGoToFirstUnreadMessageInSelectedFolder = true;
     mFolderTreeWidget->folderTreeView()->selectPrevUnreadFolder();
     mGoToFirstUnreadMessageInSelectedFolder = false;
 }
 
 void KMMainWidget::slotExpandThread()
 {
     mMessagePane->setCurrentThreadExpanded( true );
 }
 
 void KMMainWidget::slotCollapseThread()
 {
     mMessagePane->setCurrentThreadExpanded( false );
 }
 
 void KMMainWidget::slotExpandAllThreads()
 {
     // TODO: Make this asynchronous ? (if there is enough demand)
 #ifndef QT_NO_CURSOR
     MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() );
 #endif
     mMessagePane->setAllThreadsExpanded( true );
 }
 
 void KMMainWidget::slotCollapseAllThreads()
 {
     // TODO: Make this asynchronous ? (if there is enough demand)
 #ifndef QT_NO_CURSOR
     MessageViewer::KCursorSaver busy( MessageViewer::KBusyPtr::busy() );
 #endif
     mMessagePane->setAllThreadsExpanded( false );
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::updateMessageMenu()
 {
     updateMessageActions();
 }
 
 void KMMainWidget::startUpdateMessageActionsTimer()
 {
     // FIXME: This delay effectively CAN make the actions to be in an incoherent state
     //        Maybe we should mark actions as "dirty" here and check it in every action handler...
     updateMessageActions( true );
 
     menutimer->stop();
     menutimer->start( 500 );
 }
 
 void KMMainWidget::updateMessageActions( bool fast )
 {
     Akonadi::Item::List selectedItems;
     Akonadi::Item::List selectedVisibleItems;
     bool allSelectedBelongToSameThread = false;
     if (mCurrentFolder && mCurrentFolder->isValid() &&
             mMessagePane->getSelectionStats( selectedItems, selectedVisibleItems, &allSelectedBelongToSameThread )
             )
     {
         mMsgActions->setCurrentMessage( mMessagePane->currentItem(), selectedVisibleItems );
     } else {
         mMsgActions->setCurrentMessage( Akonadi::Item() );
     }
 
     if ( !fast )
         updateMessageActionsDelayed();
 
 }
 
 
 void KMMainWidget::updateMessageActionsDelayed()
 {
     int count;
     Akonadi::Item::List selectedItems;
     Akonadi::Item::List selectedVisibleItems;
     bool allSelectedBelongToSameThread = false;
     Akonadi::Item currentMessage;
     if (mCurrentFolder && mCurrentFolder->isValid() &&
             mMessagePane->getSelectionStats( selectedItems, selectedVisibleItems, &allSelectedBelongToSameThread )
             )
     {
         count = selectedItems.count();
 
         currentMessage = mMessagePane->currentItem();
 
     } else {
         count = 0;
         currentMessage = Akonadi::Item();
     }
 
     mApplyFiltersOnFolder->setEnabled( mCurrentFolder && mCurrentFolder->isValid() );
 
     //
     // Here we have:
     //
     // - A list of selected messages stored in selectedSernums.
     //   The selected messages might contain some invisible ones as a selected
     //   collapsed node "includes" all the children in the selection.
     // - A list of selected AND visible messages stored in selectedVisibleSernums.
     //   This list does not contain children of selected and collapsed nodes.
     //
     // Now, actions can operate on:
     // - Any set of messages
     //     These are called "mass actions" and are enabled whenever we have a message selected.
     //     In fact we should differentiate between actions that operate on visible selection
     //     and those that operate on the selection as a whole (without considering visibility)...
     // - A single thread
     //     These are called "thread actions" and are enabled whenever all the selected messages belong
     //     to the same thread. If the selection doesn't cover the whole thread then the action
     //     will act on the whole thread anyway (thus will silently extend the selection)
     // - A single message
     //     And we have two sub-cases:
     //     - The selection must contain exactly one message
     //       These actions can't ignore the hidden messages and thus must be disabled if
     //       the selection contains any.
     //     - The selection must contain exactly one visible message
     //       These actions will ignore the hidden message and thus can be enabled if
     //       the selection contains any.
     //
 
     bool readOnly = mCurrentFolder && mCurrentFolder->isValid() && ( mCurrentFolder->rights() & Akonadi::Collection::ReadOnly );
     // can we apply strictly single message actions ? (this is false if the whole selection contains more than one message)
     bool single_actions = count == 1;
     // can we apply loosely single message actions ? (this is false if the VISIBLE selection contains more than one message)
     bool singleVisibleMessageSelected = selectedVisibleItems.count() == 1;
     // can we apply "mass" actions to the selection ? (this is actually always true if the selection is non-empty)
     bool mass_actions = count >= 1;
     // does the selection identify a single thread ?
     bool thread_actions = mass_actions && allSelectedBelongToSameThread && mMessagePane->isThreaded();
     // can we apply flags to the selected messages ?
     bool flags_available = GlobalSettings::self()->allowLocalFlags() || !(mCurrentFolder &&  mCurrentFolder->isValid() ? readOnly : true);
 
     mThreadStatusMenu->setEnabled( thread_actions );
     // these need to be handled individually, the user might have them
     // in the toolbar
     mWatchThreadAction->setEnabled( thread_actions && flags_available );
     mIgnoreThreadAction->setEnabled( thread_actions && flags_available );
     mMarkThreadAsReadAction->setEnabled( thread_actions );
     mMarkThreadAsUnreadAction->setEnabled( thread_actions );
     mToggleThreadToActAction->setEnabled( thread_actions && flags_available );
     mToggleThreadImportantAction->setEnabled( thread_actions && flags_available );
     bool canDeleteMessages = mCurrentFolder && mCurrentFolder->isValid() && ( mCurrentFolder->rights() & Akonadi::Collection::CanDeleteItem );
 
     mTrashThreadAction->setEnabled( thread_actions && canDeleteMessages );
     mDeleteThreadAction->setEnabled( thread_actions && canDeleteMessages );
 
     if ( currentMessage.isValid() )
     {
         MessageStatus status;
         status.setStatusFromFlags( currentMessage.flags() );
         mTagActionManager->updateActionStates ( count, mMessagePane->currentItem() );
         if (thread_actions)
         {
             mToggleThreadToActAction->setChecked( status.isToAct() );
             mToggleThreadImportantAction->setChecked( status.isImportant() );
             mWatchThreadAction->setChecked( status.isWatched() );
             mIgnoreThreadAction->setChecked( status.isIgnored() );
         }
     }
 
     mMoveActionMenu->setEnabled( mass_actions && canDeleteMessages );
     if (mMoveMsgToFolderAction)
         mMoveMsgToFolderAction->setEnabled( mass_actions && canDeleteMessages );
     //mCopyActionMenu->setEnabled( mass_actions );
 
     mDeleteAction->setEnabled( mass_actions && canDeleteMessages );
 
     mExpireConfigAction->setEnabled( canDeleteMessages );
 
     if ( mMsgView ) {
         mMsgView->findInMessageAction()->setEnabled( mass_actions && !CommonKernel->folderIsTemplates( mCurrentFolder->collection() ) );
     }
     mMsgActions->forwardInlineAction()->setEnabled( mass_actions && !CommonKernel->folderIsTemplates( mCurrentFolder->collection() ) );
     mMsgActions->forwardAttachedAction()->setEnabled( mass_actions && !CommonKernel->folderIsTemplates( mCurrentFolder->collection() ) );
     mMsgActions->forwardMenu()->setEnabled( mass_actions && !CommonKernel->folderIsTemplates( mCurrentFolder->collection() ) );
 
     mMsgActions->editAction()->setEnabled( single_actions );
     mUseAction->setEnabled( single_actions && CommonKernel->folderIsTemplates( mCurrentFolder->collection() ) );
     filterMenu()->setEnabled( single_actions );
     mMsgActions->redirectAction()->setEnabled( /*single_actions &&*/mass_actions && !CommonKernel->folderIsTemplates( mCurrentFolder->collection() ) );
 
     if ( mMsgActions->customTemplatesMenu() )
     {
         mMsgActions->customTemplatesMenu()->forwardActionMenu()->setEnabled( mass_actions );
         mMsgActions->customTemplatesMenu()->replyActionMenu()->setEnabled( single_actions );
         mMsgActions->customTemplatesMenu()->replyAllActionMenu()->setEnabled( single_actions );
     }
 
     // "Print" will act on the current message: it will ignore any hidden selection
     mMsgActions->printAction()->setEnabled( singleVisibleMessageSelected );
     // "Print preview" will act on the current message: it will ignore any hidden selection
     KAction *printPreviewAction = mMsgActions->printPreviewAction();
     if (printPreviewAction)
         printPreviewAction->setEnabled( singleVisibleMessageSelected );
 
     // "View Source" will act on the current message: it will ignore any hidden selection
     if (mMsgView) {
         mMsgView->viewSourceAction()->setEnabled( singleVisibleMessageSelected );
     }
     MessageStatus status;
     status.setStatusFromFlags( currentMessage.flags() );
 
     QList< QAction *> actionList;
     bool statusSendAgain = single_actions && ( ( currentMessage.isValid() && status.isSent() ) || ( currentMessage.isValid() && CommonKernel->folderIsSentMailFolder( mCurrentFolder->collection() ) ) );
     if ( statusSendAgain ) {
         actionList << mSendAgainAction;
     } else if ( single_actions ) {
         actionList << messageActions()->editAction();
     }
     actionList << mSaveAttachmentsAction;
     if (mCurrentFolder && FolderArchive::FolderArchiveUtil::resourceSupportArchiving(mCurrentFolder->collection().resource()))
         actionList << mArchiveAction;
     mGUIClient->unplugActionList( QLatin1String( "messagelist_actionlist" ) );
     mGUIClient->plugActionList( QLatin1String( "messagelist_actionlist" ), actionList );
     mSendAgainAction->setEnabled( statusSendAgain );
 
     mSaveAsAction->setEnabled( mass_actions );
 
     if ((mCurrentFolder&& mCurrentFolder->isValid())) {
         updateMoveAction( mCurrentFolder->statistics() );
     }
     else {
         updateMoveAction(false,false);
     }
 
     const qint64 nbMsgOutboxCollection = MailCommon::Util::updatedCollection( CommonKernel->outboxCollectionFolder() ).statistics().count();
 
     mSendQueued->setEnabled( nbMsgOutboxCollection > 0 );
     mSendActionMenu->setEnabled( nbMsgOutboxCollection > 0 );
 
     const bool newPostToMailingList = mCurrentFolder && mCurrentFolder->isMailingListEnabled();
     mMessageNewList->setEnabled(newPostToMailingList);
 
     slotUpdateOnlineStatus( static_cast<GlobalSettingsBase::EnumNetworkState::type>( GlobalSettings::self()->networkState() ) );
     if (action( QLatin1String("kmail_undo") ))
         action( QLatin1String("kmail_undo") )->setEnabled( kmkernel->undoStack()->size() > 0 );
 
     // Enable / disable all filters.
     foreach ( QAction *filterAction, mFilterMenuActions ) {
         filterAction->setEnabled( count > 0 );
     }
 
     mApplyAllFiltersAction->setEnabled( count);
     mApplyFilterActionsMenu->setEnabled( count );
 }
 
 
 void KMMainWidget::slotAkonadiStandardActionUpdated()
 {
     bool multiFolder = false;
     if ( mFolderTreeWidget ) {
         multiFolder = mFolderTreeWidget->selectedCollections().count() > 1;
     }
     if ( mCollectionProperties ) {
         if ( mCurrentFolder && mCurrentFolder->collection().isValid() ) {
             const Akonadi::AgentInstance instance =
                     Akonadi::AgentManager::self()->instance( mCurrentFolder->collection().resource() );
 
             mCollectionProperties->setEnabled( !multiFolder &&
                                                !mCurrentFolder->isStructural() &&
                                                (instance.status()!=Akonadi::AgentInstance::Broken) );
         } else {
             mCollectionProperties->setEnabled(false);
         }
         QList< QAction* > collectionProperties;
         if ( mCollectionProperties->isEnabled() )
             collectionProperties << mCollectionProperties;
         mGUIClient->unplugActionList( QLatin1String("akonadi_collection_collectionproperties_actionlist") );
         mGUIClient->plugActionList( QLatin1String("akonadi_collection_collectionproperties_actionlist"), collectionProperties );
 
     }
 
     const bool folderWithContent = mCurrentFolder && !mCurrentFolder->isStructural();
 
     if ( mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::DeleteCollections ) ) {
 
         mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::DeleteCollections )->setEnabled( mCurrentFolder
                                                                                                                 && !multiFolder
                                                                                                                 && ( mCurrentFolder->collection().rights() & Collection::CanDeleteCollection )
                                                                                                                 && !mCurrentFolder->isSystemFolder()
                                                                                                                 && folderWithContent);
     }
 
     if ( mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::MoveAllToTrash ) ) {
         mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::MoveAllToTrash )->setEnabled( folderWithContent
                                                                                                                  && ( mCurrentFolder->count() > 0 )
                                                                                                                  && mCurrentFolder->canDeleteMessages()
                                                                                                                  && !multiFolder );
         mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::MoveAllToTrash )->setText( (mCurrentFolder && CommonKernel->folderIsTrash(mCurrentFolder->collection())) ? i18n("E&mpty Trash") : i18n("&Move All Messages to Trash") );
     }
 
 
     QList< QAction* > addToFavorite;
     QAction *actionAddToFavoriteCollections = akonadiStandardAction( Akonadi::StandardActionManager::AddToFavoriteCollections );
     if ( actionAddToFavoriteCollections ) {
         if ( mEnableFavoriteFolderView && actionAddToFavoriteCollections->isEnabled() )
             addToFavorite << actionAddToFavoriteCollections;
         mGUIClient->unplugActionList( QLatin1String("akonadi_collection_add_to_favorites_actionlist") );
         mGUIClient->plugActionList( QLatin1String("akonadi_collection_add_to_favorites_actionlist"), addToFavorite );
     }
 
     QList< QAction* > syncActionList;
     QAction *actionSync = akonadiStandardAction( Akonadi::StandardActionManager::SynchronizeCollections );
     if ( actionSync && actionSync->isEnabled() ) {
         syncActionList << actionSync;
     }
     actionSync = akonadiStandardAction( Akonadi::StandardActionManager::SynchronizeCollectionsRecursive );
     if ( actionSync && actionSync->isEnabled() ) {
         syncActionList << actionSync;
     }
     mGUIClient->unplugActionList( QLatin1String("akonadi_collection_sync_actionlist") );
     mGUIClient->plugActionList( QLatin1String("akonadi_collection_sync_actionlist"), syncActionList );
 
 
 
     QList< QAction* > actionList;
 
     QAction *action = mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::CreateCollection );
     if ( action && action->isEnabled() ) {
         actionList << action;
     }
 
     action =  mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::MoveCollectionToMenu );
     if ( action && action->isEnabled() ) {
         actionList <<action;
     }
 
     action =  mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::CopyCollectionToMenu);
     if ( action && action->isEnabled() ) {
         actionList <<action;
     }
     mGUIClient->unplugActionList( QLatin1String("akonadi_collection_move_copy_menu_actionlist") );
     mGUIClient->plugActionList( QLatin1String("akonadi_collection_move_copy_menu_actionlist"), actionList );
 
 
 }
 
 void KMMainWidget::updateHtmlMenuEntry()
 {
     if (mPreferHtmlAction && mPreferHtmlLoadExtAction) {
         bool multiFolder = false;
         if ( mFolderTreeWidget ) {
             multiFolder = mFolderTreeWidget->selectedCollections().count() > 1;
         }
         // the visual ones only make sense if we are showing a message list
         mPreferHtmlAction->setEnabled( mFolderTreeWidget &&
                                        mFolderTreeWidget->folderTreeView()->currentFolder().isValid() &&
                                        !multiFolder );
         mPreferHtmlLoadExtAction->setEnabled( mFolderTreeWidget &&
                                               mFolderTreeWidget->folderTreeView()->currentFolder().isValid() &&
                                               !multiFolder &&
                                               (mHtmlPref ? !mFolderHtmlPref : mFolderHtmlPref) ? true : false );
         mPreferHtmlAction->setChecked( !multiFolder &&  ( mHtmlPref ? !mFolderHtmlPref : mFolderHtmlPref ) );
         mPreferHtmlLoadExtAction->setChecked( !multiFolder &&  ( mHtmlLoadExtPref ? !mFolderHtmlLoadExtPref : mFolderHtmlLoadExtPref ) );
     }
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::updateFolderMenu()
 {
     if (!CommonKernel->outboxCollectionFolder().isValid()) {
         QTimer::singleShot(1000,this,SLOT(updateFolderMenu()));
         return;
     }
 
     const bool folderWithContent = mCurrentFolder && !mCurrentFolder->isStructural();
     bool multiFolder = false;
     if ( mFolderTreeWidget ) {
         multiFolder = mFolderTreeWidget->selectedCollections().count() > 1;
     }
     mFolderMailingListPropertiesAction->setEnabled( folderWithContent &&
                                                     !multiFolder &&
                                                     !mCurrentFolder->isSystemFolder() );
 
     QList< QAction* > actionlist;
     if ( mCurrentFolder && mCurrentFolder->collection().id() == CommonKernel->outboxCollectionFolder().id() && (mCurrentFolder->collection()).statistics().count() > 0) {
         kDebug() << "Enabling send queued";
         mSendQueued->setEnabled(true);
         actionlist << mSendQueued;
     }
     //   if ( mCurrentFolder && mCurrentFolder->collection().id() != CommonKernel->trashCollectionFolder().id() ) {
     //     actionlist << mTrashAction;
     //   }
     mGUIClient->unplugActionList( QLatin1String( "outbox_folder_actionlist" ) );
     mGUIClient->plugActionList( QLatin1String( "outbox_folder_actionlist" ), actionlist );
     actionlist.clear();
 
     const bool isASearchFolder = mCurrentFolder && mCurrentFolder->collection().resource() == QLatin1String( "akonadi_search_resource" );
     if (isASearchFolder)
         mAkonadiStandardActionManager->action( Akonadi::StandardActionManager::DeleteCollections )->setText( i18n("&Delete Search") );
 
     mArchiveFolderAction->setEnabled( mCurrentFolder && !multiFolder && folderWithContent );
 
     bool isInTrashFolder = (mCurrentFolder && CommonKernel->folderIsTrash(mCurrentFolder->collection()));
     akonadiStandardAction( Akonadi::StandardMailActionManager::MoveToTrash )->setText( isInTrashFolder ? i18nc("@action Hard delete, bypassing trash", "&Delete"): i18n("&Move to Trash") );
 
     mTrashThreadAction->setText(isInTrashFolder ?i18n("Delete T&hread"): i18n("M&ove Thread to Trash"));
 
 
 
     mExpireConfigAction->setEnabled( mCurrentFolder &&
                                      !mCurrentFolder->isStructural() &&
                                      !multiFolder &&
                                      mCurrentFolder->canDeleteMessages() &&
                                      folderWithContent &&
                                      !MailCommon::Util::isVirtualCollection( mCurrentFolder->collection() ) );
 
     updateHtmlMenuEntry();
 
     mShowFolderShortcutDialogAction->setEnabled( !multiFolder && folderWithContent );
 
     actionlist << akonadiStandardAction( Akonadi::StandardActionManager::ManageLocalSubscriptions );
     bool imapFolderIsOnline = false;
     if (mCurrentFolder && kmkernel->isImapFolder( mCurrentFolder->collection(),imapFolderIsOnline )) {
         if (imapFolderIsOnline) {
             actionlist << mServerSideSubscription;
         }
     }
 
     mGUIClient->unplugActionList( QLatin1String( "collectionview_actionlist" ) );
     mGUIClient->plugActionList( QLatin1String( "collectionview_actionlist" ), actionlist );
 
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotIntro()
 {
     if ( !mMsgView )
         return;
 
     mMsgView->clear( true );
 
     // hide widgets that are in the way:
     if ( mMessagePane && mLongFolderList )
         mMessagePane->hide();
     mMsgView->displayAboutPage();
 
     mCurrentFolder.clear();
 }
 
 void KMMainWidget::slotShowStartupFolder()
 {
     connect( MailCommon::FilterManager::instance(), SIGNAL(filtersChanged()),
              this, SLOT(initializeFilterActions()) );
     // Plug various action lists. This can't be done in the constructor, as that is called before
     // the main window or Kontact calls createGUI().
     // This function however is called with a single shot timer.
     checkAkonadiServerManagerState();
     mFolderShortcutActionManager->createActions();
     mTagActionManager->createActions();
     messageActions()->setupForwardingActionsList( mGUIClient );
 
     QString newFeaturesMD5 = KMReaderWin::newFeaturesMD5();
     if ( kmkernel->firstStart() ||
          GlobalSettings::self()->previousNewFeaturesMD5() != newFeaturesMD5 ) {
         GlobalSettings::self()->setPreviousNewFeaturesMD5( newFeaturesMD5 );
         slotIntro();
         return;
     }
 }
 
 void KMMainWidget::checkAkonadiServerManagerState()
 {
     Akonadi::ServerManager::State state = Akonadi::ServerManager::self()->state();
     if (state == Akonadi::ServerManager::Running) {
         initializeFilterActions();
     } else {
         connect( Akonadi::ServerManager::self(), SIGNAL(stateChanged(Akonadi::ServerManager::State)),
                  SLOT(slotServerStateChanged(Akonadi::ServerManager::State)) );
     }
 }
 
 void KMMainWidget::slotServerStateChanged(Akonadi::ServerManager::State state)
 {
     if (state == Akonadi::ServerManager::Running) {
         initializeFilterActions();
         disconnect( Akonadi::ServerManager::self(), SIGNAL(stateChanged(Akonadi::ServerManager::State)));
     }
 }
 
 
 void KMMainWidget::slotShowTip()
 {
     KTipDialog::showTip( this, QString(), true );
 }
 
 QList<KActionCollection*> KMMainWidget::actionCollections() const {
     return QList<KActionCollection*>() << actionCollection();
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotUpdateUndo()
 {
     if ( actionCollection()->action( QLatin1String("kmail_undo") ) ) {
         actionCollection()->action( QLatin1String("kmail_undo") )->setEnabled( kmkernel->undoStack()->size()>0 );
     }
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::clearFilterActions()
 {
     if ( !mFilterTBarActions.isEmpty() )
         if ( mGUIClient->factory() )
             mGUIClient->unplugActionList( QLatin1String("toolbar_filter_actions") );
 
     if ( !mFilterMenuActions.isEmpty() )
         if ( mGUIClient->factory() )
             mGUIClient->unplugActionList( QLatin1String("menu_filter_actions") );
 
     foreach ( QAction *a, mFilterMenuActions )
         actionCollection()->removeAction( a );
 
     mApplyFilterActionsMenu->menu()->clear();
     mFilterTBarActions.clear();
     mFilterMenuActions.clear();
 
     qDeleteAll( mFilterCommands );
     mFilterCommands.clear();
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::initializeFilterActions()
 {
     clearFilterActions();
     mApplyFilterActionsMenu->menu()->addAction( mApplyAllFiltersAction );
     bool addedSeparator = false;
 
     foreach ( MailFilter *filter, MailCommon::FilterManager::instance()->filters() ) {
         if ( !filter->isEmpty() && filter->configureShortcut() && filter->isEnabled() ) {
             QString filterName = QString::fromLatin1( "Filter %1").arg( filter->name() );
             QString normalizedName = filterName.replace(QLatin1Char(' '), QLatin1Char('_'));
             if ( action( normalizedName ) ) {
                 continue;
             }
             KMMetaFilterActionCommand *filterCommand = new KMMetaFilterActionCommand( filter->identifier(), this );
             mFilterCommands.append( filterCommand );
             QString displayText = i18n( "Filter %1", filter->name() );
             QString icon = filter->icon();
             if ( icon.isEmpty() ) {
                 icon = QLatin1String("system-run");
             }
             KAction *filterAction = new KAction( KIcon( icon ), displayText, actionCollection() );
             filterAction->setIconText( filter->toolbarName() );
 
             // The shortcut configuration is done in the filter dialog.
             // The shortcut set in the shortcut dialog would not be saved back to
             // the filter settings correctly.
             filterAction->setShortcutConfigurable( false );
             actionCollection()->addAction( normalizedName,
                                            filterAction );
             connect( filterAction, SIGNAL(triggered(bool)),
                      filterCommand, SLOT(start()) );
             filterAction->setShortcuts( filter->shortcut() );
             if ( !addedSeparator ) {
                 QAction *a = mApplyFilterActionsMenu->menu()->addSeparator();
                 mFilterMenuActions.append( a );
                 addedSeparator = true;
             }
             mApplyFilterActionsMenu->menu()->addAction( filterAction );
             mFilterMenuActions.append( filterAction );
             if ( filter->configureToolbar() ) {
                 mFilterTBarActions.append( filterAction );
             }
         }
     }
     if ( !mFilterMenuActions.isEmpty() && mGUIClient->factory() )
         mGUIClient->plugActionList( QLatin1String("menu_filter_actions"), mFilterMenuActions );
     if ( !mFilterTBarActions.isEmpty() && mGUIClient->factory() ) {
         mFilterTBarActions.prepend( mToolbarActionSeparator );
         mGUIClient->plugActionList( QLatin1String("toolbar_filter_actions"), mFilterTBarActions );
     }
 
     // Our filters have changed, now enable/disable them
     updateMessageActions();
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotAntiSpamWizard()
 {
     AntiSpamWizard wiz( AntiSpamWizard::AntiSpam, this );
     wiz.exec();
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotAntiVirusWizard()
 {
     AntiSpamWizard wiz( AntiSpamWizard::AntiVirus, this);
     wiz.exec();
 }
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotAccountWizard()
 {
     KMail::Util::launchAccountWizard( this );
 }
 
 void KMMainWidget::slotImportWizard()
 {
     const QString path = KStandardDirs::findExe( QLatin1String("importwizard" ) );
     if ( !QProcess::startDetached( path ) )
         KMessageBox::error( this, i18n( "Could not start the import wizard. "
                                         "Please check your installation." ),
                             i18n( "Unable to start import wizard" ) );
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotFilterLogViewer()
 {
     MailCommon::FilterManager::instance()->showFilterLogDialog( (qlonglong)winId() );
 }
 
 //-----------------------------------------------------------------------------
 void KMMainWidget::updateFileMenu()
 {
     const bool isEmpty = MailCommon::Util::agentInstances().isEmpty();
     actionCollection()->action(QLatin1String("check_mail"))->setEnabled( !isEmpty );
     actionCollection()->action(QLatin1String("check_mail_in"))->setEnabled( !isEmpty );
 }
 
 //-----------------------------------------------------------------------------
 const KMMainWidget::PtrList * KMMainWidget::mainWidgetList()
 {
     // better safe than sorry; check whether the global static has already been destroyed
     if ( theMainWidgetList.isDestroyed() )
     {
         return 0;
     }
     return theMainWidgetList;
 }
 
 QSharedPointer<FolderCollection> KMMainWidget::currentFolder() const
 {
     return mCurrentFolder;
 }
 
 //-----------------------------------------------------------------------------
 QString KMMainWidget::overrideEncoding() const
 {
     if ( mMsgView )
         return mMsgView->overrideEncoding();
     else
         return MessageCore::GlobalSettings::self()->overrideCharacterEncoding();
 }
 
 void KMMainWidget::showEvent( QShowEvent *event )
 {
     QWidget::showEvent( event );
     mWasEverShown = true;
 }
 
 void KMMainWidget::slotRequestFullSearchFromQuickSearch()
 {
     // First, open the search window. If we are currently on a search folder,
     // the search associated with that will be loaded.
     if ( !slotSearch() )
         return;
 
     assert( mSearchWin );
 
     // Now we look at the current state of the quick search, and if there's
     // something in there, we add the criteria to the existing search for
     // the search folder, if applicable, or make a new one from it.
     SearchPattern pattern;
     const QString searchString = mMessagePane->currentFilterSearchString();
     if ( !searchString.isEmpty() )
         pattern.append( SearchRule::createInstance( "<message>", SearchRule::FuncContains, searchString ) );
 #if 0 //PORT IT
     QList<MessageStatus> status = mMessagePane->currentFilterStatus();
     if ( status.hasAttachment() ) {
         pattern.append( SearchRule::createInstance( "<message>", SearchRule::FuncHasAttachment ) );
         status.setHasAttachment( false );
     }
 
     if ( !status.isOfUnknownStatus() ) {
         pattern.append( SearchRule::Ptr( new SearchRuleStatus( status ) ) );
     }
 #endif
     if ( !pattern.isEmpty() )
         mSearchWin->addRulesToSearchPattern( pattern );
 }
 
 void KMMainWidget::updateVacationScriptStatus( bool active, const QString &serverName )
 {
     mVacationScriptIndicator->setVacationScriptActive(active, serverName);
     mVacationIndicatorActive = mVacationScriptIndicator->hasVacationScriptActive();
 }
 
 QWidget * KMMainWidget::vacationScriptIndicator() const
 {
     return mVacationScriptIndicator;
 }
 
 void KMMainWidget::updateVacationScriptStatus()
 {
     updateVacationScriptStatus( mVacationIndicatorActive );
 }
 
 KMail::TagActionManager *KMMainWidget::tagActionManager() const
 {
     return mTagActionManager;
 }
 
 KMail::FolderShortcutActionManager *KMMainWidget::folderShortcutActionManager() const
 {
     return mFolderShortcutActionManager;
 }
 
 void KMMainWidget::slotMessageSelected(const Akonadi::Item &item)
 {
     delete mShowBusySplashTimer;
     mShowBusySplashTimer = 0;
     if ( mMsgView ) {
         // The current selection was cleared, so we'll remove the previously
         // selected message from the preview pane
         if ( !item.isValid() ) {
             mMsgView->clear();
         } else {
             mShowBusySplashTimer = new QTimer( this );
             mShowBusySplashTimer->setSingleShot( true );
             connect( mShowBusySplashTimer, SIGNAL(timeout()), this, SLOT(slotShowBusySplash()) );
             mShowBusySplashTimer->start( GlobalSettings::self()->folderLoadingTimeout() ); //TODO: check if we need a different timeout setting for this
 
             Akonadi::ItemFetchJob *itemFetchJob = MessageViewer::Viewer::createFetchJob( item );
             const QString resource = mCurrentFolder->collection().resource();
             itemFetchJob->setProperty( "_resource", QVariant::fromValue(resource) );
             connect( itemFetchJob, SIGNAL(itemsReceived(Akonadi::Item::List)),
                      SLOT(itemsReceived(Akonadi::Item::List)) );
             connect( itemFetchJob, SIGNAL(result(KJob*)), SLOT(itemsFetchDone(KJob*)) );
         }
     }
 }
 
 void KMMainWidget::itemsReceived(const Akonadi::Item::List &list )
 {
     Q_ASSERT( list.size() == 1 );
     delete mShowBusySplashTimer;
     mShowBusySplashTimer = 0;
 
     if ( !mMsgView )
         return;
 
     Item item = list.first();
 
     if ( mMessagePane ) {
         mMessagePane->show();
 
         if ( mMessagePane->currentItem() != item ) {
             // The user has selected another email already, so don't render this one.
             // Mark it as read, though, if the user settings say so.
             if ( MessageViewer::GlobalSettings::self()->delayedMarkAsRead() &&
                  MessageViewer::GlobalSettings::self()->delayedMarkTime() == 0 ) {
                 item.setFlag( Akonadi::MessageFlags::Seen );
                 Akonadi::ItemModifyJob *modifyJob = new Akonadi::ItemModifyJob( item, this );
                 modifyJob->disableRevisionCheck();
                 modifyJob->setIgnorePayload( true );
             }
             return;
         }
     }
 
     mMsgView->setMessage( item );
     // reset HTML override to the folder setting
     mMsgView->setHtmlOverride(mFolderHtmlPref);
     mMsgView->setHtmlLoadExtOverride(mFolderHtmlLoadExtPref);
     mMsgView->setDecryptMessageOverwrite( false );
     mMsgActions->setCurrentMessage( item );
 }
 
 void KMMainWidget::itemsFetchDone( KJob *job )
 {
     delete mShowBusySplashTimer;
     mShowBusySplashTimer = 0;
     if ( job->error() ) {
         // Unfortunately job->error() is Job::Unknown in many cases.
         // (see JobPrivate::handleResponse in akonadi/job.cpp)
         // So we show the "offline" page after checking the resource status.
         kDebug() << job->error() << job->errorString();
 
         const QString resource = job->property("_resource").toString();
         const Akonadi::AgentInstance agentInstance = Akonadi::AgentManager::self()->instance( resource );
         if ( !agentInstance.isOnline() ) {
             // The resource is offline
             if ( mMsgView ) {
                 mMsgView->viewer()->enableMessageDisplay();
                 mMsgView->clear( true );
             }
             mMessagePane->show();
 
             if (kmkernel->isOffline())
                 showOfflinePage();
             else
                 showResourceOfflinePage();
         } else {
             // Some other error
             BroadcastStatus::instance()->setStatusMsg( job->errorString() );
         }
     }
 }
 
 KAction *KMMainWidget::akonadiStandardAction( Akonadi::StandardActionManager::Type type )
 {
     return mAkonadiStandardActionManager->action( type );
 }
 
 KAction *KMMainWidget::akonadiStandardAction( Akonadi::StandardMailActionManager::Type type )
 {
     return mAkonadiStandardActionManager->action( type );
 }
 
 void KMMainWidget::slotCollectionProperties()
 {
     showCollectionProperties( QString() );
 }
 
 void KMMainWidget::showCollectionProperties( const QString &pageToShow )
 {
     if ( !mCurrentFolder )
         return;
 
     if ( Solid::Networking::status() == Solid::Networking::Unconnected ) {
         KMessageBox::information(
                     this,
                     i18n( "Network is unconnected. Folder information cannot be updated." ) );
         showCollectionPropertiesContinued( pageToShow, QPointer<KPIM::ProgressItem>() );
     } else {
         const Akonadi::AgentInstance agentInstance = Akonadi::AgentManager::self()->instance( mCurrentFolder->collection().resource() );
         bool isOnline = agentInstance.isOnline();
         if (!isOnline) {
             showCollectionPropertiesContinued( pageToShow, QPointer<KPIM::ProgressItem>() );
         } else {
             QPointer<KPIM::ProgressItem> progressItem( KPIM::ProgressManager::createProgressItem( i18n( "Retrieving folder properties" ) ) );
             progressItem->setUsesBusyIndicator( true );
             progressItem->setCryptoStatus(KPIM::ProgressItem::Unknown);
 
             Akonadi::CollectionAttributesSynchronizationJob *sync
                     = new Akonadi::CollectionAttributesSynchronizationJob( mCurrentFolder->collection() );
             sync->setProperty( "collectionId", mCurrentFolder->collection().id() );
             sync->setProperty( "pageToShow", pageToShow );        // note for dialog later
             sync->setProperty( "progressItem", QVariant::fromValue( progressItem ) );
             connect( sync, SIGNAL(result(KJob*)),
                      this, SLOT(slotCollectionPropertiesContinued(KJob*)) );
             connect( progressItem, SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
                      sync, SLOT(kill()) );
             connect( progressItem, SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
                      KPIM::ProgressManager::instance(), SLOT(slotStandardCancelHandler(KPIM::ProgressItem*)) );
             sync->start();
         }
     }
 }
 
 void KMMainWidget::slotCollectionPropertiesContinued( KJob* job )
 {
     QString pageToShow;
     QPointer<KPIM::ProgressItem> progressItem;
 
     if ( job ) {
         Akonadi::CollectionAttributesSynchronizationJob *sync
                 = dynamic_cast<Akonadi::CollectionAttributesSynchronizationJob *>( job );
         Q_ASSERT( sync );
         if ( sync->property( "collectionId" ) != mCurrentFolder->collection().id() )
             return;
         pageToShow = sync->property( "pageToShow" ).toString();
         progressItem = sync->property( "progressItem" ).value< QPointer<KPIM::ProgressItem> >();
         if ( progressItem ) {
             disconnect( progressItem, SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
                         sync, SLOT(kill()) );
         } else {
             // progressItem does not exist anymore, operation has been canceled
             return;
         }
     }
 
     showCollectionPropertiesContinued( pageToShow, progressItem );
 }
 
 void KMMainWidget::showCollectionPropertiesContinued( const QString &pageToShow, QPointer<KPIM::ProgressItem> progressItem )
 {
     if ( !progressItem ) {
         progressItem = KPIM::ProgressManager::createProgressItem( i18n( "Retrieving folder properties" ) );
         progressItem->setUsesBusyIndicator( true );
         progressItem->setCryptoStatus(KPIM::ProgressItem::Unknown);
         connect( progressItem, SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
                  KPIM::ProgressManager::instance(), SLOT(slotStandardCancelHandler(KPIM::ProgressItem*)) );
     }
 
     Akonadi::CollectionFetchJob *fetch = new Akonadi::CollectionFetchJob( mCurrentFolder->collection(),
                                                                           Akonadi::CollectionFetchJob::Base );
     connect( progressItem, SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), fetch, SLOT(kill()) );
     fetch->fetchScope().setIncludeStatistics( true );
     fetch->setProperty( "pageToShow", pageToShow );
     fetch->setProperty( "progressItem", QVariant::fromValue( progressItem ) );
     connect( fetch, SIGNAL(result(KJob*)),
              this, SLOT(slotCollectionPropertiesFinished(KJob*)) );
     connect( progressItem, SIGNAL(progressItemCanceled(KPIM::ProgressItem*)),
              fetch, SLOT(kill()) );
 }
 
 void KMMainWidget::slotCollectionPropertiesFinished( KJob *job )
 {
     if ( !job )
         return;
 
     QPointer<KPIM::ProgressItem> progressItem = job->property( "progressItem" ).value< QPointer<KPIM::ProgressItem> >();
     // progressItem does not exist anymore, operation has been canceled
     if ( !progressItem ) {
         return;
     }
 
     progressItem->setComplete();
     progressItem->setStatus( i18n( "Done" ) );
 
     Akonadi::CollectionFetchJob *fetch = dynamic_cast<Akonadi::CollectionFetchJob *>( job );
     Q_ASSERT( fetch );
     if ( fetch->collections().isEmpty() )
     {
         kWarning() << "no collection";
         return;
     }
 
     const Akonadi::Collection collection = fetch->collections().first();
 
     const QStringList pages = QStringList() << QLatin1String( "MailCommon::CollectionGeneralPage" )
                                             << QLatin1String( "KMail::CollectionViewPage" )
                                             << QLatin1String( "Akonadi::CachePolicyPage" )
                                             << QLatin1String( "KMail::CollectionTemplatesPage" )
                                             << QLatin1String( "MailCommon::CollectionExpiryPage" )
                                             << QLatin1String( "PimCommon::CollectionAclPage" )
                                             << QLatin1String( "KMail::CollectionMailingListPage" )
                                             << QLatin1String( "KMail::CollectionQuotaPage" )
                                             << QLatin1String( "KMail::CollectionShortcutPage" )
                                             << QLatin1String( "KMail::CollectionMaintenancePage" );
 
     Akonadi::CollectionPropertiesDialog *dlg = new Akonadi::CollectionPropertiesDialog( collection, pages, this );
     dlg->setCaption( i18nc( "@title:window", "Properties of Folder %1", collection.name() ) );
 
 
     const QString pageToShow = fetch->property( "pageToShow" ).toString();
     if ( !pageToShow.isEmpty() ) {                        // show a specific page
         dlg->setCurrentPage( pageToShow );
     }
     dlg->show();
 }
 
 void KMMainWidget::slotRemoveDuplicates()
 {
     KPIM::ProgressItem *item = KPIM::ProgressManager::createProgressItem( i18n( "Removing duplicates" ) );
     item->setUsesBusyIndicator( true );
     item->setCryptoStatus(KPIM::ProgressItem::Unknown);
 
     QItemSelectionModel *selectionModel = mFolderTreeWidget->folderTreeView()->selectionModel();
     QModelIndexList indexes = selectionModel->selectedIndexes();
     Akonadi::Collection::List collections;
 
     Q_FOREACH (const QModelIndex &index, indexes) {
         Akonadi::Collection collection = index.data(Akonadi::EntityTreeModel::CollectionRole).value<Akonadi::Collection>();
         if ( collection.isValid() ) {
             collections << collection;
         }
     }
 
     Akonadi::RemoveDuplicatesJob *job = new RemoveDuplicatesJob( collections, this );
     job->setProperty( "ProgressItem", QVariant::fromValue ( item ) );
     item->setProperty( "RemoveDuplicatesJob", QVariant::fromValue( qobject_cast<Akonadi::Job*>( job ) ) );
     connect( job, SIGNAL(finished(KJob*)), this, SLOT(slotRemoveDuplicatesDone(KJob*)) );
     connect( job, SIGNAL(description(KJob*,QString,QPair<QString,QString>,QPair<QString,QString>)), this, SLOT(slotRemoveDuplicatesUpdate(KJob*,QString)) );
     connect( item, SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), this, SLOT(slotRemoveDuplicatesCanceled(KPIM::ProgressItem*)) );
 }
 
 void KMMainWidget::slotRemoveDuplicatesDone( KJob *job )
 {
     if ( job->error() && job->error() != KJob::KilledJobError ) {
         KMessageBox::error( this, job->errorText(), i18n( "Error while removing duplicates" ) );
     }
 
     KPIM::ProgressItem *item = job->property( "ProgressItem" ).value<KPIM::ProgressItem*>();
     if ( item ) {
         item->setComplete();
         item->setStatus( i18n( "Done" ) );
         item = 0;
     }
 }
 
 void KMMainWidget::slotRemoveDuplicatesCanceled( KPIM::ProgressItem *item )
 {
     Akonadi::Job *job = item->property( "RemoveDuplicatesJob" ).value<Akonadi::Job*>();
     if ( job ) {
         job->kill( KJob::Quietly );
     }
 
     item->setComplete();
     item = 0;
 }
 
 void KMMainWidget::slotRemoveDuplicatesUpdate( KJob* job, const QString& description )
 {
     KPIM::ProgressItem *item = job->property( "ProgressItem" ).value<KPIM::ProgressItem*>();
     if ( item ) {
         item->setStatus( description );
     }
 }
 
 
 void KMMainWidget::slotServerSideSubscription()
 {
     if ( !mCurrentFolder )
         return;
     bool isImapOnline = false;
     if ( kmkernel->isImapFolder( mCurrentFolder->collection(), isImapOnline ) ) {
         QDBusInterface iface(
                     QLatin1String( "org.freedesktop.Akonadi.Resource.")+mCurrentFolder->collection().resource(),
                     QLatin1String( "/" ), QLatin1String( "org.kde.Akonadi.Imap.Resource" ),
                     DBusConnectionPool::threadConnection(), this );
         if ( !iface.isValid() ) {
             kDebug()<<"Cannot create imap dbus interface";
             return;
         }
         QDBusPendingCall call = iface.asyncCall( QLatin1String( "configureSubscription" ), (qlonglong)winId() );
         QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
         connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(slotConfigureSubscriptionFinished(QDBusPendingCallWatcher*)));
     }
 }
 
 void KMMainWidget::slotConfigureSubscriptionFinished(QDBusPendingCallWatcher* watcher)
 {
     QDBusPendingReply<int> reply = *watcher;
     if ( !reply.isValid() ) {
         return;
     }
     if (reply == -2 ){
         KMessageBox::error(this,i18n("IMAP server not configured yet. Please configure the server in the IMAP account before setting up server-side subscription."));
     } else if (reply == -1) {
         KMessageBox::error(this,i18n("Log in failed, please configure the IMAP account before setting up server-side subscription."));
     }
     watcher->deleteLater();
 }
 
 void KMMainWidget::savePaneSelection()
 {
     if (mMessagePane) {
         mMessagePane->saveCurrentSelection();
     }
 }
 
 void KMMainWidget::slotConfigureAutomaticArchiving()
 {
     OrgFreedesktopAkonadiArchiveMailAgentInterface archiveMailInterface(QLatin1String("org.freedesktop.Akonadi.ArchiveMailAgent"), QLatin1String("/ArchiveMailAgent"),QDBusConnection::sessionBus(), this);
     if (archiveMailInterface.isValid()) {
         archiveMailInterface.showConfigureDialog( (qlonglong)winId() );
     } else {
         KMessageBox::error(this,i18n("Archive Mail Agent was not registered."));
     }
 }
 
 void KMMainWidget::slotConfigureSendLater()
 {
     OrgFreedesktopAkonadiSendLaterAgentInterface sendLaterInterface(QLatin1String("org.freedesktop.Akonadi.SendLaterAgent"), QLatin1String("/SendLaterAgent"),QDBusConnection::sessionBus(), this);
     if (sendLaterInterface.isValid()) {
         sendLaterInterface.showConfigureDialog( (qlonglong)winId() );
     } else {
         KMessageBox::error(this,i18n("Send Later Agent was not registered."));
     }
 }
 
 void KMMainWidget::updatePaneTagComboBox()
 {
     if (mMessagePane) {
         mMessagePane->updateTagComboBox();
     }
 }
 
 
 void KMMainWidget::slotExportData()
 {
     const QString path = KStandardDirs::findExe( QLatin1String("pimsettingexporter" ) );
     if ( !QProcess::startDetached( path ) )
         KMessageBox::error( this, i18n( "Could not start \"PIM Setting Exporter\" program. "
                                         "Please check your installation." ),
                             i18n( "Unable to start \"PIM Setting Exporter\" program" ) );
 }
 
 void KMMainWidget::slotCreateAddressBookContact()
 {
     CreateNewContactJob *job = new CreateNewContactJob( this, this );
     job->start();
 }
 
 void KMMainWidget::slotOpenRecentMsg(const KUrl& url)
 {
     KMOpenMsgCommand *openCommand = new KMOpenMsgCommand( this, url, overrideEncoding(), this );
     openCommand->start();
 }
 
 void KMMainWidget::addRecentFile(const KUrl& mUrl)
 {
     mOpenRecentAction->addUrl(mUrl);
     KConfigGroup grp = mConfig->group(QLatin1String("Recent Files"));
     mOpenRecentAction->saveEntries(grp);
     grp.sync();
 }
 
 void KMMainWidget::slotMoveMessageToTrash()
 {
     if (messageView() && messageView()->viewer()) {
         KMTrashMsgCommand *command = new KMTrashMsgCommand( mCurrentFolder->collection(), messageView()->viewer()->messageItem(), -1 );
         command->start();
     }
 }
 
 void KMMainWidget::slotArchiveMails()
 {
     const QList<Akonadi::Item> selectedMessages = mMessagePane->selectionAsMessageItemList();
     KMKernel::self()->folderArchiveManager()->setArchiveItems(selectedMessages, mCurrentFolder->collection().resource());
 }
 
 void KMMainWidget::updateQuickSearchLineText()
 {
     //If change change shortcut
     mMessagePane->setQuickSearchClickMessage(i18nc("Show shortcut for focus quick search. Don't change it", "Search...<%1>",mQuickSearchAction->shortcut().toString()));
 }
diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp
index 8f8caf2785..196c8e0c0b 100644
--- a/kmail/messageactions.cpp
+++ b/kmail/messageactions.cpp
@@ -1,656 +1,632 @@
 /*
     Copyright (c) 2007 Volker Krause <vkrause@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #include "messageactions.h"
 
 #include "settings/globalsettings.h"
 #include "kmreaderwin.h"
 #include "kmkernel.h"
 #include "kernel/mailkernel.h"
 #include "kmmainwidget.h"
 #include "util.h"
 #include "kmcommands.h"
 #include "customtemplatesmenu.h"
 
-#include "messagecore/widgets/annotationdialog.h"
 #include "messagecore/settings/globalsettings.h"
 #include "messagecore/misc/mailinglist.h"
 #include "messagecore/helpers/messagehelpers.h"
 #include "messageviewer/viewer/csshelper.h"
 #include "messageviewer/settings/globalsettings.h"
 
 #include <akonadi/itemfetchjob.h>
 #include <akonadi/kmime/messageparts.h>
 #include <Akonadi/ChangeRecorder>
 #include <KAction>
 #include <KActionMenu>
 #include <KActionCollection>
 #include <KDebug>
 #include <KLocalizedString>
 #include <KXMLGUIClient>
 #include <KStandardDirs>
 #include <KRun>
 #include <KMenu>
 #include <KUriFilterData>
 #include <KToolInvocation>
 #include <KUriFilter>
 #include <KStringHandler>
 #include <KPrintPreview>
 
 #include <QVariant>
 #include <qwidget.h>
 #include <akonadi/collection.h>
-#include <akonadi/entityannotationsattribute.h>
 #include <util/mailutil.h>
 
 using namespace KMail;
 
 MessageActions::MessageActions( KActionCollection *ac, QWidget *parent )
     : QObject( parent ),
       mParent( parent ),
       mMessageView( 0 ),
       mRedirectAction( 0 ),
       mPrintPreviewAction( 0 ),
       mCustomTemplatesMenu( 0 )
 {
     mReplyActionMenu = new KActionMenu( KIcon(QLatin1String("mail-reply-sender")), i18nc("Message->","&Reply"), this );
     ac->addAction( QLatin1String("message_reply_menu"), mReplyActionMenu );
     connect( mReplyActionMenu, SIGNAL(triggered(bool)),
              this, SLOT(slotReplyToMsg()) );
 
     mReplyAction = new KAction( KIcon(QLatin1String("mail-reply-sender")), i18n("&Reply..."), this );
     ac->addAction( QLatin1String("reply"), mReplyAction );
     mReplyAction->setShortcut(Qt::Key_R);
     connect( mReplyAction, SIGNAL(triggered(bool)),
              this, SLOT(slotReplyToMsg()) );
     mReplyActionMenu->addAction( mReplyAction );
 
     mReplyAuthorAction = new KAction( KIcon(QLatin1String("mail-reply-sender")), i18n("Reply to A&uthor..."), this );
     ac->addAction( QLatin1String("reply_author"), mReplyAuthorAction );
     mReplyAuthorAction->setShortcut(Qt::SHIFT+Qt::Key_A);
     connect( mReplyAuthorAction, SIGNAL(triggered(bool)),
              this, SLOT(slotReplyAuthorToMsg()) );
     mReplyActionMenu->addAction( mReplyAuthorAction );
 
     mReplyAllAction = new KAction( KIcon(QLatin1String("mail-reply-all")), i18n("Reply to &All..."), this );
     ac->addAction( QLatin1String("reply_all"), mReplyAllAction );
     mReplyAllAction->setShortcut( Qt::Key_A );
     connect( mReplyAllAction, SIGNAL(triggered(bool)),
              this, SLOT(slotReplyAllToMsg()) );
     mReplyActionMenu->addAction( mReplyAllAction );
 
     mReplyListAction = new KAction( KIcon(QLatin1String("mail-reply-list")), i18n("Reply to Mailing-&List..."), this );
     ac->addAction( QLatin1String("reply_list"), mReplyListAction );
     mReplyListAction->setShortcut( Qt::Key_L );
     connect( mReplyListAction, SIGNAL(triggered(bool)),
              this, SLOT(slotReplyListToMsg()) );
     mReplyActionMenu->addAction( mReplyListAction );
 
     mNoQuoteReplyAction = new KAction( i18n("Reply Without &Quote..."), this );
     ac->addAction(QLatin1String("noquotereply"), mNoQuoteReplyAction );
     mNoQuoteReplyAction->setShortcut( Qt::SHIFT+Qt::Key_R );
     connect( mNoQuoteReplyAction, SIGNAL(triggered(bool)),
              this, SLOT(slotNoQuoteReplyToMsg()) );
 
 
     mListFilterAction = new KAction(i18n("Filter on Mailing-&List..."), this);
     ac->addAction(QLatin1String("mlist_filter"), mListFilterAction );
     connect(mListFilterAction, SIGNAL(triggered(bool)), SLOT(slotMailingListFilter()));
 
     mStatusMenu = new KActionMenu ( i18n( "Mar&k Message" ), this );
     ac->addAction( QLatin1String("set_status"), mStatusMenu );
 
 
     KMMainWidget* mainwin = kmkernel->getKMMainWidget();
     if ( mainwin ) {
         KAction * action = mainwin->akonadiStandardAction( Akonadi::StandardMailActionManager::MarkMailAsRead );
         mStatusMenu->addAction( action );
 
         action = mainwin->akonadiStandardAction( Akonadi::StandardMailActionManager::MarkMailAsUnread );
         mStatusMenu->addAction( action );
 
         mStatusMenu->addSeparator();
         action = mainwin->akonadiStandardAction( Akonadi::StandardMailActionManager::MarkMailAsImportant );
         mStatusMenu->addAction( action );
 
         action = mainwin->akonadiStandardAction( Akonadi::StandardMailActionManager::MarkMailAsActionItem );
         mStatusMenu->addAction( action );
 
     }
 
     mEditAction = new KAction( KIcon(QLatin1String("accessories-text-editor")), i18n("&Edit Message"), this );
     ac->addAction( QLatin1String("edit"), mEditAction );
     connect( mEditAction, SIGNAL(triggered(bool)),
              this, SLOT(editCurrentMessage()) );
     mEditAction->setShortcut( Qt::Key_T );
 
-    mAnnotateAction = new KAction( KIcon( QLatin1String("view-pim-notes") ), i18n( "Add Note..."), this );
-    ac->addAction( QLatin1String("annotate"), mAnnotateAction );
-    connect( mAnnotateAction, SIGNAL(triggered(bool)),
-             this, SLOT(annotateMessage()) );
-
     mPrintAction = KStandardAction::print( this, SLOT(slotPrintMsg()), ac );
     if(KPrintPreview::isAvailable())
         mPrintPreviewAction = KStandardAction::printPreview( this, SLOT(slotPrintPreviewMsg()), ac );
 
     mForwardActionMenu  = new KActionMenu(KIcon(QLatin1String("mail-forward")), i18nc("Message->","&Forward"), this);
     ac->addAction(QLatin1String("message_forward"), mForwardActionMenu );
 
     mForwardAttachedAction = new KAction( KIcon(QLatin1String("mail-forward")),
                                           i18nc( "@action:inmenu Message->Forward->",
                                                  "As &Attachment..." ),
                                           this );
     connect( mForwardAttachedAction, SIGNAL(triggered(bool)),
              parent, SLOT(slotForwardAttachedMsg()) );
     ac->addAction( QLatin1String("message_forward_as_attachment"), mForwardAttachedAction );
 
     mForwardInlineAction = new KAction( KIcon( QLatin1String("mail-forward") ),
                                         i18nc( "@action:inmenu Message->Forward->",
                                                "&Inline..." ),
                                         this );
     connect( mForwardInlineAction, SIGNAL(triggered(bool)),
              parent, SLOT(slotForwardInlineMsg()) );
     ac->addAction( QLatin1String("message_forward_inline"), mForwardInlineAction );
 
     setupForwardActions();
 
     mRedirectAction  = new KAction(i18nc("Message->Forward->", "&Redirect..."), this );
     ac->addAction( QLatin1String("message_forward_redirect"), mRedirectAction );
     connect( mRedirectAction, SIGNAL(triggered(bool)),
              parent, SLOT(slotRedirectMsg()) );
     mRedirectAction->setShortcut( QKeySequence( Qt::Key_E ) );
     mForwardActionMenu->addAction( mRedirectAction );
 
     //FIXME add KIcon("mail-list") as first arguement. Icon can be derived from
     // mail-reply-list icon by removing top layers off svg
     mMailingListActionMenu = new KActionMenu( i18nc( "Message->", "Mailing-&List" ), this );
     connect( mMailingListActionMenu->menu(), SIGNAL(triggered(QAction*)),
              this, SLOT(slotRunUrl(QAction*)) );
     ac->addAction( QLatin1String("mailing_list"), mMailingListActionMenu );
     mMailingListActionMenu->setEnabled(false);
 
     connect( kmkernel->folderCollectionMonitor(), SIGNAL(itemChanged(Akonadi::Item,QSet<QByteArray>)), SLOT(slotItemModified(Akonadi::Item,QSet<QByteArray>)));
     connect( kmkernel->folderCollectionMonitor(), SIGNAL(itemRemoved(Akonadi::Item)), SLOT(slotItemRemoved(Akonadi::Item)));
 
     mCustomTemplatesMenu = new TemplateParser::CustomTemplatesMenu( parent, ac );
 
     connect( mCustomTemplatesMenu, SIGNAL(replyTemplateSelected(QString)),
              parent, SLOT(slotCustomReplyToMsg(QString)) );
     connect( mCustomTemplatesMenu, SIGNAL(replyAllTemplateSelected(QString)),
              parent, SLOT(slotCustomReplyAllToMsg(QString)) );
     connect( mCustomTemplatesMenu, SIGNAL(forwardTemplateSelected(QString)),
              parent, SLOT(slotCustomForwardMsg(QString)) );
     connect( KMKernel::self(), SIGNAL(customTemplatesChanged()), mCustomTemplatesMenu, SLOT(update()) );
 
     forwardMenu()->addSeparator();
     forwardMenu()->addAction( mCustomTemplatesMenu->forwardActionMenu() );
     replyMenu()->addSeparator();
     replyMenu()->addAction( mCustomTemplatesMenu->replyActionMenu() );
     replyMenu()->addAction( mCustomTemplatesMenu->replyAllActionMenu() );
 
     updateActions();
 }
 
 MessageActions::~MessageActions()
 {
     delete mCustomTemplatesMenu;
 }
 
 TemplateParser::CustomTemplatesMenu* MessageActions::customTemplatesMenu() const
 {
     return mCustomTemplatesMenu;
 }
 
 void MessageActions::setCurrentMessage( const Akonadi::Item &msg, const Akonadi::Item::List &items )
 {
     mCurrentItem = msg;
 
     if (!items.isEmpty()) {
         if (msg.isValid()) {
             mVisibleItems = items;
         } else {
             mVisibleItems.clear();
         }
     }
 
     if ( !msg.isValid() ) {
         mVisibleItems.clear();
         clearMailingListActions();
     }
 
     updateActions();
 }
 
 void MessageActions::slotItemRemoved(const Akonadi::Item& item)
 {
     if ( item == mCurrentItem ) {
         mCurrentItem = Akonadi::Item();
         updateActions();
     }
 }
 
 void MessageActions::slotItemModified( const Akonadi::Item &  item, const QSet< QByteArray > &  partIdentifiers )
 {
     Q_UNUSED( partIdentifiers );
     if ( item == mCurrentItem ) {
         mCurrentItem = item;
         const int numberOfVisibleItems = mVisibleItems.count();
         for ( int i = 0; i < numberOfVisibleItems; ++i ) {
             Akonadi::Item it = mVisibleItems.at(i);
             if ( item == it ) {
                 mVisibleItems[i] = item;
             }
         }
         updateActions();
     }
 }
 
 void MessageActions::updateActions()
 {
     const bool hasPayload = mCurrentItem.hasPayload<KMime::Message::Ptr>();
     bool itemValid = mCurrentItem.isValid();
     Akonadi::Collection parent;
     if ( itemValid ) //=> valid
         parent = mCurrentItem.parentCollection();
     if ( parent.isValid() ) {
         if ( CommonKernel->folderIsTemplates(parent) )
             itemValid = false;
     }
 
     const bool multiVisible = mVisibleItems.count() > 0 || mCurrentItem.isValid();
     const bool uniqItem = ( itemValid||hasPayload ) && ( mVisibleItems.count()<=1 );
     mReplyActionMenu->setEnabled( hasPayload );
     mReplyAction->setEnabled( hasPayload );
     mNoQuoteReplyAction->setEnabled( hasPayload );
     mReplyAuthorAction->setEnabled( hasPayload );
     mReplyAllAction->setEnabled( hasPayload );
     mReplyListAction->setEnabled( hasPayload );
     mNoQuoteReplyAction->setEnabled( hasPayload );
 
-    mAnnotateAction->setEnabled( uniqItem );
-    if ( !mCurrentItem.hasAttribute<Akonadi::EntityAnnotationsAttribute>() )
-        mAnnotateAction->setText( i18n( "Add Note..." ) );
-    else
-        mAnnotateAction->setText( i18n( "Edit Note...") );
-
     mStatusMenu->setEnabled( multiVisible );
 
     if ( mCurrentItem.hasPayload<KMime::Message::Ptr>() ) {
         if ( mCurrentItem.loadedPayloadParts().contains("RFC822") ) {
             updateMailingListActions( mCurrentItem );
         } else {
             Akonadi::ItemFetchJob *job = new Akonadi::ItemFetchJob( mCurrentItem );
             job->fetchScope().fetchAllAttributes();
             job->fetchScope().fetchFullPayload( true );
             job->fetchScope().fetchPayloadPart( Akonadi::MessagePart::Header );
-            job->fetchScope().fetchAttribute<Akonadi::EntityAnnotationsAttribute>();
             connect( job, SIGNAL(result(KJob*)), SLOT(slotUpdateActionsFetchDone(KJob*)) );
         }
     }
     mEditAction->setEnabled( uniqItem );
 }
 
 void MessageActions::slotUpdateActionsFetchDone(KJob* job)
 {
     if ( job->error() )
         return;
 
     Akonadi::ItemFetchJob *fetchJob = static_cast<Akonadi::ItemFetchJob*>( job );
     if ( fetchJob->items().isEmpty() )
         return;
     Akonadi::Item  messageItem = fetchJob->items().first();
     if ( messageItem == mCurrentItem ) {
         mCurrentItem = messageItem;
         updateMailingListActions( messageItem );
     }
 }
 
 void MessageActions::clearMailingListActions()
 {
     mMailingListActionMenu->setEnabled( false );
     mListFilterAction->setEnabled( false );
     mListFilterAction->setText( i18n("Filter on Mailing-List...") );
 }
 
 void MessageActions::updateMailingListActions( const Akonadi::Item& messageItem )
 {
     KMime::Message::Ptr message = messageItem.payload<KMime::Message::Ptr>();
     const MessageCore::MailingList mailList = MessageCore::MailingList::detect( message );
 
     if ( mailList.features() == MessageCore::MailingList::None ) {
         clearMailingListActions();
     } else {
         // A mailing list menu with only a title is pretty boring
         // so make sure theres at least some content
         QString listId;
         if ( mailList.features() & MessageCore::MailingList::Id ) {
             // From a list-id in the form, "Birds of France <bof.yahoo.com>",
             // take "Birds of France" if it exists otherwise "bof.yahoo.com".
             listId = mailList.id();
             const int start = listId.indexOf( QLatin1Char( '<' ) );
             if ( start > 0 ) {
                 listId.truncate( start - 1 );
             } else if ( start == 0 ) {
                 const int end = listId.lastIndexOf( QLatin1Char( '>' ) );
                 if ( end < 1 ) { // shouldn't happen but account for it anyway
                     listId.remove( 0, 1 );
                 } else {
                     listId = listId.mid( 1, end-1 );
                 }
             }
         }
         mMailingListActionMenu->menu()->clear();
         qDeleteAll(mMailListActionList);
         mMailListActionList.clear();
         if ( !listId.isEmpty() )
             mMailingListActionMenu->menu()->addTitle( listId );
 
         if ( mailList.features() & MessageCore::MailingList::ArchivedAt )
             // IDEA: this may be something you want to copy - "Copy in submenu"?
             addMailingListActions( i18n( "Open Message in List Archive" ), mailList.archivedAtUrls() );
         if ( mailList.features() & MessageCore::MailingList::Post )
             addMailingListActions( i18n( "Post New Message" ), mailList.postUrls() );
         if ( mailList.features() & MessageCore::MailingList::Archive )
             addMailingListActions( i18n( "Go to Archive" ), mailList.archiveUrls() );
         if ( mailList.features() & MessageCore::MailingList::Help )
             addMailingListActions( i18n( "Request Help" ), mailList.helpUrls() );
         if ( mailList.features() & MessageCore::MailingList::Owner )
             addMailingListActions( i18nc( "Contact the owner of the mailing list", "Contact Owner" ), mailList.ownerUrls() );
         if ( mailList.features() & MessageCore::MailingList::Subscribe )
             addMailingListActions( i18n( "Subscribe to List" ), mailList.subscribeUrls() );
         if ( mailList.features() & MessageCore::MailingList::Unsubscribe )
             addMailingListActions( i18n( "Unsubscribe from List" ), mailList.unsubscribeUrls() );
         mMailingListActionMenu->setEnabled( true );
 
         QByteArray name;
         QString value;
         const QString lname = MailingList::name( message, name, value );
         if ( !lname.isEmpty() ) {
             mListFilterAction->setEnabled( true );
             mListFilterAction->setText( i18n( "Filter on Mailing-List %1...", lname ) );
         }
     }
 }
 
 
 void MessageActions::replyCommand(MessageComposer::ReplyStrategy strategy)
 {
     if ( !mCurrentItem.hasPayload<KMime::Message::Ptr>() ) return;
 
     const QString text = mMessageView ? mMessageView->copyText() : QString();
     KMCommand *command = new KMReplyCommand( mParent, mCurrentItem, strategy, text );
     connect( command, SIGNAL(completed(KMCommand*)),
              this, SIGNAL(replyActionFinished()) );
     command->start();
 }
 
 void MessageActions::setMessageView(KMReaderWin * msgView)
 {
     mMessageView = msgView;
 }
 
 void MessageActions::setupForwardActions()
 {
     disconnect( mForwardActionMenu, SIGNAL(triggered(bool)), 0, 0 );
     mForwardActionMenu->removeAction( mForwardInlineAction );
     mForwardActionMenu->removeAction( mForwardAttachedAction );
 
     if ( GlobalSettings::self()->forwardingInlineByDefault() ) {
         mForwardActionMenu->insertAction( mRedirectAction, mForwardInlineAction );
         mForwardActionMenu->insertAction( mRedirectAction, mForwardAttachedAction );
         mForwardInlineAction->setShortcut(QKeySequence(Qt::Key_F));
         mForwardAttachedAction->setShortcut(QKeySequence(Qt::SHIFT+Qt::Key_F));
         QObject::connect( mForwardActionMenu, SIGNAL(triggered(bool)),
                           mParent, SLOT(slotForwardInlineMsg()) );
     } else {
         mForwardActionMenu->insertAction( mRedirectAction, mForwardAttachedAction );
         mForwardActionMenu->insertAction( mRedirectAction, mForwardInlineAction );
         mForwardInlineAction->setShortcut(QKeySequence(Qt::Key_F));
         mForwardAttachedAction->setShortcut(QKeySequence(Qt::SHIFT+Qt::Key_F));
         QObject::connect( mForwardActionMenu, SIGNAL(triggered(bool)),
                           mParent, SLOT(slotForwardAttachedMsg()) );
     }
 }
 
 void MessageActions::setupForwardingActionsList( KXMLGUIClient *guiClient )
 {
     QList<QAction*> forwardActionList;
     guiClient->unplugActionList( QLatin1String("forward_action_list") );
     if ( GlobalSettings::self()->forwardingInlineByDefault() ) {
         forwardActionList.append( mForwardInlineAction );
         forwardActionList.append( mForwardAttachedAction );
     } else {
         forwardActionList.append( mForwardAttachedAction );
         forwardActionList.append( mForwardInlineAction );
     }
     forwardActionList.append( mRedirectAction );
     guiClient->plugActionList( QLatin1String("forward_action_list"), forwardActionList );
 }
 
 
 void MessageActions::slotReplyToMsg()
 {
     replyCommand( MessageComposer::ReplySmart );
 }
 
 void MessageActions::slotReplyAuthorToMsg()
 {
     replyCommand( MessageComposer::ReplyAuthor );
 }
 
 void MessageActions::slotReplyListToMsg()
 {
     replyCommand( MessageComposer::ReplyList );
 }
 
 void MessageActions::slotReplyAllToMsg()
 {
     replyCommand( MessageComposer::ReplyAll );
 }
 
 void MessageActions::slotNoQuoteReplyToMsg()
 {
     if ( !mCurrentItem.hasPayload<KMime::Message::Ptr>() )
         return;
     KMCommand *command = new KMReplyCommand( mParent, mCurrentItem, MessageComposer::ReplySmart, QString(), true );
     command->start();
 }
 
 void MessageActions::slotRunUrl( QAction *urlAction )
 {
     const QVariant q = urlAction->data();
     if ( q.type() == QVariant::String ) {
         new KRun( KUrl( q.toString() ) , mParent );
     }
 }
 
 void MessageActions::slotMailingListFilter()
 {
     if ( !mCurrentItem.hasPayload<KMime::Message::Ptr>() )
         return;
 
     KMCommand *command = new KMMailingListFilterCommand( mParent, mCurrentItem );
     command->start();
 }
 
 void MessageActions::printMessage(bool preview)
 {
     bool result = false;
     if ( mMessageView ) {
         if (MessageViewer::GlobalSettings::self()->printSelectedText()) {
             result = mMessageView->printSelectedText(preview);
         }
     }
     if (!result) {
         const bool useFixedFont = MessageViewer::GlobalSettings::self()->useFixedFont();
         const QString overrideEncoding = MessageCore::GlobalSettings::self()->overrideCharacterEncoding();
 
         const Akonadi::Item message = mCurrentItem;
         KMPrintCommand *command =
                 new KMPrintCommand( mParent, message,
                                     mMessageView->viewer()->headerStyle(), mMessageView->viewer()->headerStrategy(),
                                     mMessageView->viewer()->htmlOverride(), mMessageView->viewer()->htmlLoadExternal(),
                                     useFixedFont, overrideEncoding );
         command->setPrintPreview(preview);
         command->start();
     }
 }
 
 void MessageActions::slotPrintPreviewMsg()
 {
     printMessage(true);
 }
 
 void MessageActions::slotPrintMsg()
 {
     printMessage(false);
 }
 
 /**
  * This adds a list of actions to mMailingListActionMenu mapping the identifier item to
  * the url.
  *
  * e.g.: item = "Contact Owner"
  * "Contact Owner (email)" -> KRun( "mailto:bob@arthouseflowers.example.com" )
  * "Contact Owner (web)" -> KRun( "http://arthouseflowers.example.com/contact-owner.php" )
  */
 void MessageActions::addMailingListActions( const QString &item, const KUrl::List &list )
 {
     foreach ( const KUrl& url, list ) {
         addMailingListAction( item, url );
     }
 }
 
 /**
  * This adds a action to mMailingListActionMenu mapping the identifier item to
  * the url. See addMailingListActions above.
  */
 void MessageActions::addMailingListAction( const QString &item, const KUrl &url )
 {
     QString protocol = url.protocol().toLower();
     QString prettyUrl = url.prettyUrl();
     if ( protocol == QLatin1String("mailto") ) {
         protocol = i18n( "email" );
         prettyUrl.remove( 0, 7 ); // length( "mailto:" )
     } else if ( protocol.startsWith( QLatin1String( "http" ) ) ) {
         protocol = i18n( "web" );
     }
     // item is a mailing list url description passed from the updateActions method above.
     KAction *act = new KAction( i18nc( "%1 is a 'Contact Owner' or similar action. %2 is a protocol normally web or email though could be irc/ftp or other url variant", "%1 (%2)",  item, protocol ) , this );
     mMailListActionList.append(act);
     const QVariant v(  url.url() );
     act->setData( v );
     act->setHelpText( prettyUrl );
     mMailingListActionMenu->addAction( act );
 }
 
 void MessageActions::editCurrentMessage()
 {
     KMCommand *command = 0;
     if ( mCurrentItem.isValid() ) {
         Akonadi::Collection col = mCurrentItem.parentCollection();
         qDebug()<<" mCurrentItem.parentCollection()"<<mCurrentItem.parentCollection();
         // edit, unlike send again, removes the message from the folder
         // we only want that for templates and drafts folders
         if ( col.isValid()
              && ( CommonKernel->folderIsDraftOrOutbox( col ) ||
                   CommonKernel->folderIsTemplates( col ) )
              )
             command = new KMEditItemCommand( mParent, mCurrentItem, true );
         else
             command = new KMEditItemCommand( mParent, mCurrentItem, false );
         command->start();
     } else if ( mCurrentItem.hasPayload<KMime::Message::Ptr>() ) {
         command = new KMEditMessageCommand( mParent, mCurrentItem.payload<KMime::Message::Ptr>() );
         command->start();
     }
 }
 
-void MessageActions::annotateMessage()
-{
-    if ( !mCurrentItem.isValid() )
-        return;
-
-    MessageCore::AnnotationEditDialog *dialog = new MessageCore::AnnotationEditDialog( mCurrentItem );
-    dialog->setAttribute( Qt::WA_DeleteOnClose );
-    dialog->exec();
-}
-
 void MessageActions::addWebShortcutsMenu( KMenu *menu, const QString & text )
 {
     if ( text.isEmpty() )
         return;
 
     QString searchText = text;
     searchText = searchText.replace( QLatin1Char('\n'), QLatin1Char(' ') ).replace( QLatin1Char('\r'), QLatin1Char(' ') ).simplified();
 
     if ( searchText.isEmpty() )
         return;
 
     KUriFilterData filterData( searchText );
 
     filterData.setSearchFilteringOptions( KUriFilterData::RetrievePreferredSearchProvidersOnly );
 
     if ( KUriFilter::self()->filterSearchUri( filterData, KUriFilter::NormalTextFilter ) ) {
         const QStringList searchProviders = filterData.preferredSearchProviders();
 
         if ( !searchProviders.isEmpty() ) {
             KMenu *webShortcutsMenu = new KMenu( menu );
             webShortcutsMenu->setIcon( KIcon( QLatin1String("preferences-web-browser-shortcuts") ) );
 
             const QString squeezedText = KStringHandler::rsqueeze( searchText, 21 );
             webShortcutsMenu->setTitle( i18n( "Search for '%1' with", squeezedText ) );
 
             KAction *action = 0;
 
             foreach( const QString &searchProvider, searchProviders ) {
                 action = new KAction( searchProvider, webShortcutsMenu );
                 action->setIcon( KIcon( filterData.iconNameForPreferredSearchProvider( searchProvider ) ) );
                 action->setData( filterData.queryForPreferredSearchProvider( searchProvider ) );
                 connect( action, SIGNAL(triggered()), this, SLOT(slotHandleWebShortcutAction()) );
                 webShortcutsMenu->addAction( action );
             }
 
             webShortcutsMenu->addSeparator();
 
             action = new KAction( i18n( "Configure Web Shortcuts..." ), webShortcutsMenu );
             action->setIcon( KIcon( QLatin1String("configure") ) );
             connect( action, SIGNAL(triggered()), this, SLOT(slotConfigureWebShortcuts()) );
             webShortcutsMenu->addAction( action );
 
             menu->addMenu(webShortcutsMenu);
         }
     }
 }
 
 void MessageActions::slotHandleWebShortcutAction()
 {
     KAction *action = qobject_cast<KAction*>( sender() );
 
     if (action) {
         KUriFilterData filterData( action->data().toString() );
         if ( KUriFilter::self()->filterSearchUri( filterData, KUriFilter::WebShortcutFilter ) ) {
             KToolInvocation::invokeBrowser( filterData.uri().url() );
         }
     }
 }
 
 void MessageActions::slotConfigureWebShortcuts()
 {
     KToolInvocation::kdeinitExec( QLatin1String("kcmshell4"), QStringList() << QLatin1String("ebrowsing") );
 }
diff --git a/kmail/messageactions.h b/kmail/messageactions.h
index 7733db135d..a10a2f8d7e 100644
--- a/kmail/messageactions.h
+++ b/kmail/messageactions.h
@@ -1,157 +1,155 @@
 /*
     Copyright (c) 2007 Volker Krause <vkrause@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #ifndef KMAIL_MESSAGEACTIONS_H
 #define KMAIL_MESSAGEACTIONS_H
 
 #include "messagecomposer/helper/messagefactory.h"
 #include <KUrl>
 
 #include <qobject.h>
 
 class QWidget;
 class QAction;
 class KJob;
 class KAction;
 class KActionMenu;
 class KActionCollection;
 class KXMLGUIClient;
 class KMReaderWin;
 class KMenu;
 
 namespace Akonadi {
 class Item;
 }
 
 namespace TemplateParser {
 class CustomTemplatesMenu;
 }
 
 namespace KMail {
 
 /**
   Manages common actions that can be performed on one or more messages.
 */
 class MessageActions : public QObject
 {
     Q_OBJECT
 public:
     explicit MessageActions( KActionCollection* ac, QWidget *parent );
     ~MessageActions();
     void setMessageView( KMReaderWin *msgView );
 
     /**
      * This function adds or updates the actions of the forward action menu, taking the
      * preference whether to forward inline or as attachment by default into account.
      * This has to be called when that preference config has been changed.
      */
     void setupForwardActions();
 
     /**
      * Sets up action list for forward menu.
      */
     void setupForwardingActionsList( KXMLGUIClient *guiClient );
 
     void setCurrentMessage(const Akonadi::Item &item , const Akonadi::Item::List &items = Akonadi::Item::List());
 
     KActionMenu* replyMenu() const { return mReplyActionMenu; }
     KAction* replyListAction() const { return mReplyListAction; }
     KAction* createTodoAction() const { return mCreateTodoAction; }
     KAction* forwardInlineAction() const { return mForwardInlineAction; }
     KAction* forwardAttachedAction() const { return mForwardAttachedAction; }
     KAction* redirectAction() const { return mRedirectAction; }
 
     KActionMenu* messageStatusMenu() const { return mStatusMenu; }
     KActionMenu *forwardMenu() const { return mForwardActionMenu; }
 
     KAction* editAction() const { return mEditAction; }
-    KAction* annotateAction() const { return mAnnotateAction; }
     KAction* printAction() const { return mPrintAction; }
     KAction* printPreviewAction() const { return mPrintPreviewAction; }
     KAction* listFilterAction() const { return mListFilterAction; }
 
     KActionMenu* mailingListActionMenu() const { return mMailingListActionMenu; }
     TemplateParser::CustomTemplatesMenu* customTemplatesMenu() const;
 
     void addWebShortcutsMenu( KMenu *menu, const QString & text );
 
 
 signals:
     // This signal is emitted when a reply is triggered and the
     // action has finished.
     // This is useful for the stand-alone reader, it might want to close the window in
     // that case.
     void replyActionFinished();
 
 public slots:
     void editCurrentMessage();
-    void annotateMessage();
 
 private:
     void updateActions();
     void replyCommand(MessageComposer::ReplyStrategy strategy);
     void addMailingListAction( const QString &item, const KUrl &url );
     void addMailingListActions( const QString &item, const KUrl::List &list );
     void updateMailingListActions( const Akonadi::Item& messageItem );
     void printMessage(bool preview);
     void clearMailingListActions();
 
 
 private slots:
     void slotItemModified( const Akonadi::Item &  item, const QSet< QByteArray > &  partIdentifiers );
     void slotItemRemoved(const Akonadi::Item& item);
 
     void slotReplyToMsg();
     void slotReplyAuthorToMsg();
     void slotReplyListToMsg();
     void slotReplyAllToMsg();
     void slotNoQuoteReplyToMsg();
     void slotRunUrl( QAction *urlAction );
     void slotPrintMsg();
     void slotPrintPreviewMsg();
 
     void slotUpdateActionsFetchDone( KJob* job );
     void slotMailingListFilter();
     void slotHandleWebShortcutAction();
     void slotConfigureWebShortcuts();
 
 
 private:
     QList<KAction*> mMailListActionList;
     QWidget *mParent;
     Akonadi::Item mCurrentItem;
     Akonadi::Item::List mVisibleItems;
     KMReaderWin *mMessageView;
 
     KActionMenu *mReplyActionMenu;
     KAction *mReplyAction, *mReplyAllAction, *mReplyAuthorAction,
     *mReplyListAction, *mNoQuoteReplyAction,
     *mForwardInlineAction, *mForwardAttachedAction, *mRedirectAction;
     KAction *mCreateTodoAction;
     KActionMenu *mStatusMenu;
     KActionMenu *mForwardActionMenu;
     KActionMenu *mMailingListActionMenu;
-    KAction *mEditAction, *mAnnotateAction, *mPrintAction, *mPrintPreviewAction;
+    KAction *mEditAction, *mPrintAction, *mPrintPreviewAction;
     TemplateParser::CustomTemplatesMenu *mCustomTemplatesMenu;
     KAction *mListFilterAction;
 };
 
 }
 
 #endif
 
diff --git a/messagecore/CMakeLists.txt b/messagecore/CMakeLists.txt
index dfb30ff4a5..4afbe8183a 100644
--- a/messagecore/CMakeLists.txt
+++ b/messagecore/CMakeLists.txt
@@ -1,69 +1,68 @@
 project(messagecore)
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
 add_definitions( -DQT_NO_CAST_FROM_ASCII )
 add_definitions( -DQT_NO_CAST_TO_ASCII )
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5300)
 
 add_subdirectory(tests)
 
 include_directories( ${Boost_INCLUDE_DIR} 
                      ${CMAKE_SOURCE_DIR}/pimcommon
                    )
 
 ########### next target ###############
 
 set(messagecore_LIB_SRCS
 
    misc/imagecollector.cpp
    attachment/attachmentcollector.cpp
    attachment/attachmentcompressjob.cpp
    attachment/attachmentfromfolderjob.cpp
    attachment/attachmentfrommimecontentjob.cpp
    attachment/attachmentfromurlbasejob.cpp
    attachment/attachmentfromurljob.cpp
    attachment/attachmentloadjob.cpp
    attachment/attachmentpart.cpp
    attachment/attachmentpropertiesdialog.cpp
    widgets/emailaddressrequester.cpp
    settings/globalsettings.cpp
    misc/mailinglist.cpp
    misc/mdnstateattribute.cpp
    helpers/messagehelpers.cpp
    helpers/nodehelper.cpp
    utils/stringutil.cpp
-   widgets/annotationdialog.cpp
 )
 
 kde4_add_kcfg_files(messagecore_LIB_SRCS
   settings/globalsettings_base.kcfgc
 )
 
 kde4_add_ui_files(messagecore_LIB_SRCS
   attachment/ui/attachmentpropertiesdialog.ui
   attachment/ui/attachmentpropertiesdialog_readonly.ui
 )
 
 kde4_add_library(messagecore ${LIBRARY_TYPE} ${messagecore_LIB_SRCS})
 
 target_link_libraries(messagecore
   ${KDEPIMLIBS_KMIME_LIBS}
   ${KDE4_KDEUI_LIBS}
   ${KDE4_KIO_LIBS}
   ${KDEPIMLIBS_KABC_LIBS}
   ${KDEPIMLIBS_KPIMUTILS_LIBS}
   ${KDEPIMLIBS_AKONADI_LIBS}
   ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS}
   ${KDEPIMLIBS_AKONADI_CONTACT_LIBS}
   ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
   pimcommon
 )
 
 target_link_libraries(messagecore LINK_INTERFACE_LIBRARIES
   ${KDEPIMLIBS_KMIME_LIBS}
   ${KDE4_KDEUI_LIBS}
   ${KDE4_KIO_LIBS}
 )
 
 set_target_properties(messagecore PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
 install(TARGETS messagecore ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/messagecore/widgets/annotationdialog.cpp b/messagecore/widgets/annotationdialog.cpp
deleted file mode 100644
index 3e37bb205b..0000000000
--- a/messagecore/widgets/annotationdialog.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/* Copyright 2010 Thomas McGuire <mcguire@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License or (at your option) version 3 or any later version
-   accepted by the membership of KDE e.V. (or its successor approved
-   by the membership of KDE e.V.), which shall act as a proxy
-   defined in Section 14 of version 3 of the license.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "annotationdialog.h"
-#include "pimcommon/texteditor/richtexteditor/richtexteditorwidget.h"
-
-#include <KMessageBox>
-#include <KLocalizedString>
-#include <Akonadi/ItemModifyJob>
-#include <KSharedConfig>
-#include <akonadi/item.h>
-#include <akonadi/entityannotationsattribute.h>
-
-
-#include <QLabel>
-#include <QGridLayout>
-
-using namespace MessageCore;
-
-class AnnotationEditDialog::Private
-{
-public:
-    Private()
-        : mTextEdit( 0 ),
-          mHasAnnotation( false )
-    {
-    }
-
-    Akonadi::Item mItem;
-    PimCommon::RichTextEditorWidget *mTextEdit;
-    bool mHasAnnotation;
-};
-
-AnnotationEditDialog::AnnotationEditDialog( const Akonadi::Item &item, QWidget *parent )
-    : KDialog( parent ), d( new Private )
-{
-    d->mItem = item;
-    //check for correct key?
-    d->mHasAnnotation = item.hasAttribute<Akonadi::EntityAnnotationsAttribute>();
-    if ( d->mHasAnnotation ) {
-        setCaption( i18n( "Edit Note" ) );
-        setButtons( Ok | Cancel | User1 );
-        setButtonText( User1, i18n( "Delete Note" ) );
-        setButtonIcon( User1, KIcon( QLatin1String("edit-delete") ) );
-    } else {
-        setCaption( i18n( "Add Note" ) );
-        setButtons( Ok | Cancel );
-    }
-
-    setDefaultButton( KDialog::Ok );
-
-    QLabel *label = new QLabel( i18n( "Enter the text that should be stored as a note to the mail:" ) );
-    QGridLayout *grid = new QGridLayout( mainWidget() );
-    d->mTextEdit = new PimCommon::RichTextEditorWidget( this );
-    d->mTextEdit->setAcceptRichText(false);
-    grid->addWidget( label );
-    grid->addWidget( d->mTextEdit );
-    d->mTextEdit->setFocus();
-
-    if ( d->mHasAnnotation && item.attribute<Akonadi::EntityAnnotationsAttribute>() ) {
-        //TODO shared/private annotations
-        d->mTextEdit->setPlainText( item.attribute<Akonadi::EntityAnnotationsAttribute>()->value("/private/comment") );
-    }
-    readConfig();
-}
-
-AnnotationEditDialog::~AnnotationEditDialog()
-{
-    writeConfig();
-    delete d;
-}
-
-void AnnotationEditDialog::slotButtonClicked( int button )
-{
-    if ( button == KDialog::Ok ) {
-        bool textIsEmpty = d->mTextEdit->toPlainText().isEmpty();
-        if ( !textIsEmpty ) {
-            d->mItem.removeAttribute<Akonadi::EntityAnnotationsAttribute>();
-            Akonadi::EntityAnnotationsAttribute *annotation = d->mItem.attribute<Akonadi::EntityAnnotationsAttribute>(Akonadi::Entity::AddIfMissing);
-            annotation->insert("/private/comment", d->mTextEdit->toPlainText());
-            d->mItem.addAttribute(annotation);
-        } else if ( d->mHasAnnotation && textIsEmpty ) {
-            d->mItem.removeAttribute<Akonadi::EntityAnnotationsAttribute>();
-        }
-        new Akonadi::ItemModifyJob(d->mItem);
-
-        accept();
-    } else if ( button == KDialog::Cancel ) {
-        reject();
-    } else if ( button == KDialog::User1 ) {
-        const int answer = KMessageBox::warningContinueCancel( this,
-                                                               i18n( "Do you really want to delete this note?" ),
-                                                               i18n( "Delete Note?" ), KGuiItem( i18n( "Delete" ), QLatin1String("edit-delete") ) );
-        if ( answer == KMessageBox::Continue ) {
-            d->mItem.removeAttribute<Akonadi::EntityAnnotationsAttribute>();
-            new Akonadi::ItemModifyJob(d->mItem);
-            accept();
-        }
-    }
-}
-
-void AnnotationEditDialog::readConfig()
-{
-    KSharedConfig::Ptr cfg = KGlobal::config();
-    KConfigGroup group( cfg, "AnnotationEditDialog" );
-    QSize size = group.readEntry( "Size", QSize() );
-    if ( !size.isEmpty() ) {
-        resize( size );
-    }
-}
-
-void AnnotationEditDialog::writeConfig()
-{
-    KSharedConfig::Ptr cfg = KGlobal::config();
-    KConfigGroup group( cfg, "AnnotationEditDialog" );
-    group.writeEntry( "Size", size() );
-}
-
-
-
diff --git a/messagecore/widgets/annotationdialog.h b/messagecore/widgets/annotationdialog.h
deleted file mode 100644
index 3b5c63bf0d..0000000000
--- a/messagecore/widgets/annotationdialog.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2010 Thomas McGuire <mcguire@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License or (at your option) version 3 or any later version
-   accepted by the membership of KDE e.V. (or its successor approved
-   by the membership of KDE e.V.), which shall act as a proxy
-   defined in Section 14 of version 3 of the license.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef MESSAGECORE_ANNOTATIONDIALOG_H
-#define MESSAGECORE_ANNOTATIONDIALOG_H
-
-#include "messagecore_export.h"
-
-#include <KDialog>
-
-namespace Akonadi {
-class Item;
-}
-
-namespace MessageCore {
-
-/**
- * @short A dialog for editing annotations of an email.
- *
- * @author Thomas McGuire <mcguire@kde.org>
- */
-class MESSAGECORE_EXPORT AnnotationEditDialog : public KDialog
-{
-    Q_OBJECT
-
-public:
-    /**
-     * Creates a new annotation edit dialog.
-     *
-     * @param item The item.
-     * @param parent The parent widget.
-     */
-    explicit AnnotationEditDialog( const Akonadi::Item &item, QWidget *parent = 0 );
-
-    /**
-     * Destroys the annotation edit dialog.
-     */
-    ~AnnotationEditDialog();
-
-protected:
-    /// Reimplemented to handle button clicks
-    void slotButtonClicked( int button );
-    void readConfig();
-    void writeConfig();
-
-private:
-    //@cond PRIVATE
-    class Private;
-    Private* const d;
-    //@endcond
-};
-
-}
-
-#endif
diff --git a/messagelist/core/messageitem.cpp b/messagelist/core/messageitem.cpp
index 7c1cfaf6d2..52b7775050 100644
--- a/messagelist/core/messageitem.cpp
+++ b/messagelist/core/messageitem.cpp
@@ -1,770 +1,754 @@
 
 /******************************************************************************
  *
  *  Copyright 2008 Szymon Tomasz Stefanek <pragma@kvirc.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *******************************************************************************/
 
 #include "messageitem.h"
 #include "messageitem_p.h"
 
-#include "messagecore/widgets/annotationdialog.h"
 #include "theme.h"
 
 #include <akonadi/item.h>
-#include <akonadi/entityannotationsattribute.h>
 #include <akonadi/tagattribute.h>
 #include <akonadi/tagfetchjob.h>
 #include <akonadi/tagfetchscope.h>
 #include <KIconLoader>
 #include <KLocalizedString>
 
 using namespace MessageList::Core;
 
 K_GLOBAL_STATIC( TagCache, s_tagCache )
 
 class MessageItem::Tag::Private
 {
     public:
     Private()
         :mPriority( 0 ) //Initialize it
     {
 
     }
     QPixmap mPixmap;
     QString mName;
     QString mId;             ///< The unique id of this tag
     QColor mTextColor;
     QColor mBackgroundColor;
     QFont  mFont;
     int mPriority;
 };
 
 MessageItem::Tag::Tag( const QPixmap &pix, const QString &tagName, const QString &tagId )
     : d( new Private )
 {
     d->mPixmap = pix;
     d->mName = tagName;
     d->mId = tagId;
 }
 
 MessageItem::Tag::~Tag()
 {
     delete d;
 }
 
 QPixmap MessageItem::Tag::pixmap() const
 {
     return d->mPixmap;
 }
 
 QString MessageItem::Tag::name() const
 {
     return d->mName;
 }
 
 QString MessageItem::Tag::id() const
 {
     return d->mId;
 }
 
 QColor MessageItem::Tag::textColor() const
 {
     return d->mTextColor;
 }
 
 QColor MessageItem::Tag::backgroundColor() const
 {
     return d->mBackgroundColor;
 }
 
 QFont MessageItem::Tag::font() const
 {
     return d->mFont;
 }
 
 int MessageItem::Tag::priority() const
 {
     return d->mPriority;
 }
 
 void MessageItem::Tag::setTextColor( const QColor &textColor )
 {
     d->mTextColor = textColor;
 }
 
 void MessageItem::Tag::setBackgroundColor( const QColor &backgroundColor )
 {
     d->mBackgroundColor = backgroundColor;
 }
 
 void MessageItem::Tag::setFont( const QFont &font )
 {
     d->mFont = font;
 }
 
 void MessageItem::Tag::setPriority( int priority )
 {
     d->mPriority = priority;
 }
 
 
 class MessageItemPrivateSettings
 {
 public:
     QColor mColorUnreadMessage;
     QColor mColorImportantMessage;
     QColor mColorToDoMessage;
     QFont mFont;
     QFont mFontUnreadMessage;
     QFont mFontImportantMessage;
     QFont mFontToDoMessage;
     QString mFontKey;
     QString mFontUnreadMessageKey;
     QString mFontImportantMessageKey;
     QString mFontToDoMessageKey;
 };
 
 K_GLOBAL_STATIC(MessageItemPrivateSettings, s_settings)
 
 MessageItemPrivate::MessageItemPrivate( MessageItem* qq )
     : ItemPrivate( qq ),
       mThreadingStatus( MessageItem::ParentMissing ),
       mEncryptionState( MessageItem::NotEncrypted ),
       mSignatureState( MessageItem::NotSigned ),
       mAboutToBeRemoved( false ),
       mSubjectIsPrefixed( false ),
       mTagList( 0 )
 {
 }
 
 MessageItemPrivate::~MessageItemPrivate()
 {
     s_tagCache->cancelRequest(this);
     invalidateTagCache();
 }
 
 void MessageItemPrivate::invalidateTagCache()
 {
     if ( mTagList ) {
         qDeleteAll( *mTagList );
         delete mTagList;
         mTagList = 0;
     }
 }
 
 void MessageItemPrivate::invalidateAnnotationCache()
 {
+  //FIXME NOTES_ON_EMAIL
 }
 
 const MessageItem::Tag* MessageItemPrivate::bestTag() const
 {
     const MessageItem::Tag *best = 0;
     foreach( const MessageItem::Tag* tag, getTagList() ) {
         if ( !best || tag->priority() < best->priority() )
             best = tag;
     }
     return best;
 }
 
 void MessageItemPrivate::fillTagList(const Akonadi::Tag::List &taglist)
 {
     Q_ASSERT( !mTagList );
     mTagList = new QList<MessageItem::Tag*>;
 
     // TODO: The tag pointers here could be shared between all items, there really is no point in
     //       creating them for each item that has tags
 
     //Priority sort this and make bestTag more efficient
 
     foreach( const Akonadi::Tag &tag, taglist ) {
         QString symbol = QLatin1String( "mail-tagged" );
         Akonadi::TagAttribute *attr = tag.attribute<Akonadi::TagAttribute>();
         if (attr) {
             if (!attr->iconName().isEmpty()) {
                 symbol = attr->iconName();
             }
         }
         MessageItem::Tag *messageListTag =
                 new MessageItem::Tag( SmallIcon( symbol ), tag.name(), tag.url().url() );
 
         if (attr) {
             messageListTag->setTextColor( attr->textColor() );
             messageListTag->setBackgroundColor( attr->backgroundColor() );
             if (!attr->font().isEmpty()) {
                 QFont font;
                 if (font.fromString( attr->font() )) {
                     messageListTag->setFont( font );
                 }
             }
             if (attr->priority() != -1) {
                 messageListTag->setPriority( attr->priority() );
             } else {
                 messageListTag->setPriority( 0xFFFF );
             }
         }
 
         mTagList->append( messageListTag );
     }
 }
 
 QList<MessageItem::Tag*> MessageItemPrivate::getTagList() const
 {
     if ( !mTagList ) {
         s_tagCache->retrieveTags(mAkonadiItem.tags(), const_cast<MessageItemPrivate*>(this));
         return QList<MessageItem::Tag*>();
     }
 
     return *mTagList;
 }
 
 bool MessageItemPrivate::tagListInitialized() const
 {
     return mTagList != 0;
 }
 
 MessageItem::MessageItem()
     : Item( Message, new MessageItemPrivate( this ) ), ModelInvariantIndex()
 {
 }
 
 MessageItem::MessageItem ( MessageItemPrivate* dd )
     : Item ( Message, dd ), ModelInvariantIndex()
 {
 }
 
 MessageItem::~MessageItem()
 {
 }
 
 QList< MessageItem::Tag * > MessageItem::tagList() const
 {
     Q_D( const MessageItem );
     return d->getTagList();
 }
 
 bool MessageItem::hasAnnotation() const
 {
     Q_D( const MessageItem );
-    //TODO check for note entry?
-    return d->mAkonadiItem.hasAttribute<Akonadi::EntityAnnotationsAttribute>();
+    //FIXME NOTES_ON_EMAIL
+    return false;
 }
 
 QString MessageItem::annotation() const
 {
     Q_D( const MessageItem );
-    if ( d->mAkonadiItem.hasAttribute<Akonadi::EntityAnnotationsAttribute>() ) {
-        Akonadi::EntityAnnotationsAttribute *attr = d->mAkonadiItem.attribute<Akonadi::EntityAnnotationsAttribute>();
-        const QMap<QByteArray, QByteArray> annotations = attr->annotations();
-        if (annotations.contains("/private/comment")) {
-            return QString::fromLatin1(annotations.value("/private/comment"));
-        }
-        if (annotations.contains("/shared/comment")) {
-            return QString::fromLatin1(annotations.value("/shared/comment"));
-        }
-    }
+    //FIXME NOTES_ON_EMAIL
     return QString();
 }
 
 void MessageItem::editAnnotation()
 {
     Q_D( MessageItem );
-    if ( d->mAnnotationDialog.data() )
-        return;
-    d->mAnnotationDialog = new MessageCore::AnnotationEditDialog( d->mAkonadiItem );
-    d->mAnnotationDialog.data()->setAttribute( Qt::WA_DeleteOnClose );
-    //FIXME make async
-    if ( d->mAnnotationDialog.data()->exec() ) {
-        // invalidate the cached mHasAnnotation value
-    }
+    //FIXME: NOTES_ON_EMAIL
 }
 
 const MessageItem::Tag * MessageItemPrivate::findTagInternal( const QString &szTagId ) const
 {
     foreach( const MessageItem::Tag *tag, getTagList() ) {
         if ( tag->id() == szTagId )
             return tag;
     }
     return 0;
 }
 
 const MessageItem::Tag *MessageItem::findTag( const QString &szTagId ) const
 {
     Q_D( const MessageItem );
     return d->findTagInternal( szTagId );
 }
 
 QString MessageItem::tagListDescription() const
 {
     QString ret;
 
     foreach( const Tag *tag, tagList() ) {
         if ( !ret.isEmpty() )
             ret += QLatin1String( ", " );
         ret += tag->name();
     }
 
     return ret;
 }
 
 void MessageItem::invalidateTagCache()
 {
     Q_D( MessageItem );
     d->invalidateTagCache();
 }
 
 void MessageItem::invalidateAnnotationCache()
 {
     Q_D( MessageItem );
+    //FIXME: NOTES_ON_EMAIL
     d->invalidateAnnotationCache();
 }
 
 QColor MessageItem::textColor() const
 {
     Q_D( const MessageItem );
     const Tag *bestTag = d->bestTag();
     if ( bestTag != 0 && bestTag->textColor().isValid() ) {
         return bestTag->textColor();
     }
     QColor clr;
     Akonadi::MessageStatus messageStatus = status();
     if ( !messageStatus.isRead() ) {
         clr = s_settings->mColorUnreadMessage;
     } else if ( messageStatus.isImportant() ) {
         clr = s_settings->mColorImportantMessage;
     } else if ( messageStatus.isToAct() ) {
         clr = s_settings->mColorToDoMessage;
     }
 
     return clr;
 }
 
 QColor MessageItem::backgroundColor() const
 {
     Q_D( const MessageItem );
     const Tag *bestTag = d->bestTag();
     if ( bestTag ) {
         return bestTag->backgroundColor();
     } else {
         return QColor();
     }
 }
 
 QFont MessageItem::font() const
 {
     Q_D( const MessageItem );
     // for performance reasons we don't want font retrieval to trigger
     // full tags loading, as the font is used for geometry calculation
     // and thus this method called for each item
     if ( d->tagListInitialized() ) {
         const Tag *bestTag = d->bestTag();
         if ( bestTag && bestTag->font() != QFont() ) {
             return bestTag->font();
         }
     }
 
     QFont font;
 
     // from KDE3: "important" overrides "new" overrides "unread" overrides "todo"
     Akonadi::MessageStatus messageStatus = status();
     if ( messageStatus.isImportant() ) {
         font = s_settings->mFontImportantMessage;
     } else if ( !messageStatus.isRead() ) {
         font = s_settings->mFontUnreadMessage;
     } else if ( messageStatus.isToAct() ) {
         font = s_settings->mFontToDoMessage;
     } else {
         font = s_settings->mFont;
     }
 
     return font;
 }
 
 QString MessageItem::fontKey() const
 {
     Q_D( const MessageItem );
 
     // for performance reasons we don't want font retrieval to trigger
     // full tags loading, as the font is used for geometry calculation
     // and thus this method called for each item
     if ( d->tagListInitialized() ) {
         const Tag *bestTag = d->bestTag();
         if ( bestTag  && bestTag->font() != QFont() ) {
             return bestTag->font().key();
         }
     }
 
     // from KDE3: "important" overrides "new" overrides "unread" overrides "todo"
     Akonadi::MessageStatus messageStatus = status();
     if ( messageStatus.isImportant() ) {
         return s_settings->mFontImportantMessageKey;
     } else if ( !messageStatus.isRead() ) {
         return s_settings->mFontUnreadMessageKey;
     } else if ( messageStatus.isToAct() ) {
         return s_settings->mFontToDoMessageKey;
     } else {
         return s_settings->mFontKey;
     }
 
 }
 
 
 MessageItem::SignatureState MessageItem::signatureState() const
 {
     Q_D( const MessageItem );
     return d->mSignatureState;
 }
 
 void MessageItem::setSignatureState( SignatureState state )
 {
     Q_D( MessageItem );
     d->mSignatureState = state;
 }
 
 MessageItem::EncryptionState MessageItem::encryptionState() const
 {
     Q_D( const MessageItem );
     return d->mEncryptionState;
 }
 
 void MessageItem::setEncryptionState( EncryptionState state )
 {
     Q_D( MessageItem );
     d->mEncryptionState = state;
 }
 
 QByteArray MessageItem::messageIdMD5() const
 {
     Q_D( const MessageItem );
     return d->mMessageIdMD5;
 }
 
 void MessageItem::setMessageIdMD5( const QByteArray &md5 )
 {
     Q_D( MessageItem );
     d->mMessageIdMD5 = md5;
 }
 
 QByteArray MessageItem::inReplyToIdMD5() const
 {
     Q_D( const MessageItem );
     return d->mInReplyToIdMD5;
 }
 
 void MessageItem::setInReplyToIdMD5( const QByteArray& md5 )
 {
     Q_D( MessageItem );
     d->mInReplyToIdMD5 = md5;
 }
 
 QByteArray MessageItem::referencesIdMD5() const
 {
     Q_D( const MessageItem );
     return d->mReferencesIdMD5;
 }
 
 void MessageItem::setReferencesIdMD5( const QByteArray& md5 )
 {
     Q_D( MessageItem );
     d->mReferencesIdMD5 = md5;
 }
 
 void MessageItem::setSubjectIsPrefixed( bool subjectIsPrefixed )
 {
     Q_D( MessageItem );
     d->mSubjectIsPrefixed = subjectIsPrefixed;
 }
 
 bool MessageItem::subjectIsPrefixed() const
 {
     Q_D( const MessageItem );
     return d->mSubjectIsPrefixed;
 }
 
 QByteArray MessageItem::strippedSubjectMD5() const
 {
     Q_D( const MessageItem );
     return d->mStrippedSubjectMD5;
 }
 
 void MessageItem::setStrippedSubjectMD5( const QByteArray& md5 )
 {
     Q_D( MessageItem );
     d->mStrippedSubjectMD5 = md5;
 }
 
 bool MessageItem::aboutToBeRemoved() const
 {
     Q_D( const MessageItem );
     return d->mAboutToBeRemoved;
 }
 
 void MessageItem::setAboutToBeRemoved( bool aboutToBeRemoved )
 {
     Q_D( MessageItem );
     d->mAboutToBeRemoved = aboutToBeRemoved;
 }
 
 MessageItem::ThreadingStatus MessageItem::threadingStatus() const
 {
     Q_D( const MessageItem );
     return d->mThreadingStatus;
 }
 
 void MessageItem::setThreadingStatus( ThreadingStatus threadingStatus )
 {
     Q_D( MessageItem );
     d->mThreadingStatus = threadingStatus;
 }
 
 unsigned long MessageItem::uniqueId() const
 {
     Q_D( const MessageItem );
     return d->mAkonadiItem.id();
 }
 
 Akonadi::Item MessageList::Core::MessageItem::akonadiItem() const
 {
     Q_D( const MessageItem );
     return d->mAkonadiItem;
 }
 
 void MessageList::Core::MessageItem::setAkonadiItem(const Akonadi::Item& item)
 {
     Q_D( MessageItem );
     d->mAkonadiItem = item;
 }
 
 MessageItem * MessageItem::topmostMessage()
 {
     if ( !parent() )
         return this;
     if ( parent()->type() == Item::Message )
         return static_cast< MessageItem * >( parent() )->topmostMessage();
     return this;
 }
 
 QString MessageItem::accessibleTextForField(Theme::ContentItem::Type field)
 {
     switch (field) {
     case Theme::ContentItem::Subject:
         return d_ptr->mSubject;
     case Theme::ContentItem::Sender:
         return d_ptr->mSender;
     case Theme::ContentItem::Receiver:
         return d_ptr->mReceiver;
     case Theme::ContentItem::SenderOrReceiver:
         return senderOrReceiver();
     case Theme::ContentItem::Date:
         return formattedDate();
     case Theme::ContentItem::Size:
         return formattedSize();
     case Theme::ContentItem::RepliedStateIcon:
         return status().isReplied() ? i18nc( "Status of an item", "Replied" ) : QString();
     case Theme::ContentItem::ReadStateIcon:
         return status().isRead() ? i18nc( "Status of an item", "Read" ) : i18nc( "Status of an item", "Unread" );
     case Theme::ContentItem::CombinedReadRepliedStateIcon:
         return accessibleTextForField( Theme::ContentItem::ReadStateIcon ) + accessibleTextForField( Theme::ContentItem::RepliedStateIcon );
     default:
         return QString();
     }
 }
 
 
 QString MessageItem::accessibleText( const Theme* theme, int columnIndex )
 {
     QStringList rowsTexts;
 
     Q_FOREACH( Theme::Row *row, theme->column(columnIndex)->messageRows() ) {
         QStringList leftStrings;
         QStringList rightStrings;
         Q_FOREACH( Theme::ContentItem *contentItem, row->leftItems() ) {
             leftStrings.append( accessibleTextForField( contentItem->type() ) );
         }
 
         Q_FOREACH( Theme::ContentItem *contentItem, row->rightItems() ) {
             rightStrings.insert( rightStrings.begin(), accessibleTextForField( contentItem->type() ) );
         }
 
         rowsTexts.append( ( leftStrings + rightStrings ).join( QLatin1String( " " ) ) );
     }
 
     return rowsTexts.join( QLatin1String(" ") );
 }
 
 void MessageItem::subTreeToList( QList< MessageItem * > &list )
 {
     list.append( this );
     QList< Item * > * childList = childItems();
     if ( !childList )
         return;
     QList< Item * >::ConstIterator end( childList->constEnd() );
     for ( QList< Item * >::ConstIterator it = childList->constBegin(); it != end; ++it )
     {
         Q_ASSERT( ( *it )->type() == Item::Message );
         static_cast< MessageItem * >( *it )->subTreeToList( list );
     }
 }
 
 void MessageItem::setUnreadMessageColor( const QColor &color )
 {
     s_settings->mColorUnreadMessage = color;
 }
 
 
 void MessageItem::setImportantMessageColor( const QColor &color )
 {
     s_settings->mColorImportantMessage = color;
 }
 
 
 void MessageItem::setToDoMessageColor( const QColor &color )
 {
     s_settings->mColorToDoMessage = color;
 }
 
 
 void MessageItem::setGeneralFont( const QFont &font )
 {
     s_settings->mFont = font;
     s_settings->mFontKey = font.key();
 }
 
 void MessageItem::setUnreadMessageFont( const QFont &font )
 {
     s_settings->mFontUnreadMessage = font;
     s_settings->mFontUnreadMessageKey = font.key();
 }
 
 void MessageItem::setImportantMessageFont( const QFont &font )
 {
     s_settings->mFontImportantMessage = font;
     s_settings->mFontImportantMessageKey = font.key();
 }
 
 void MessageItem::setToDoMessageFont( const QFont &font )
 {
     s_settings->mFontToDoMessage = font;
     s_settings->mFontToDoMessageKey = font.key();
 }
 
 FakeItemPrivate::FakeItemPrivate( FakeItem *qq ) : MessageItemPrivate( qq )
 {
 }
 
 FakeItem::FakeItem()
     : MessageItem( new FakeItemPrivate( this ) )
 {
 }
 
 FakeItem::~FakeItem()
 {
 }
 
 QList< MessageItem::Tag * > FakeItem::tagList() const
 {
     Q_D( const FakeItem );
     return d->mFakeTags;
 }
 
 void FakeItem::setFakeTags( const QList< MessageItem::Tag* > &tagList )
 {
     Q_D( FakeItem );
     d->mFakeTags = tagList;
 }
 
 bool FakeItem::hasAnnotation() const
 {
     return true;
 }
 
 TagCache::TagCache()
     :QObject(),
       mMonitor(new Akonadi::Monitor(this))
 {
     mCache.setMaxCost(100);
     mMonitor->setTypeMonitored(Akonadi::Monitor::Tags);
     mMonitor->tagFetchScope().fetchAttribute<Akonadi::TagAttribute>();
     connect(mMonitor, SIGNAL(tagAdded(Akonadi::Tag)), this, SLOT(onTagAdded(Akonadi::Tag)));
     connect(mMonitor, SIGNAL(tagRemoved(Akonadi::Tag)), this, SLOT(onTagRemoved(Akonadi::Tag)));
     connect(mMonitor, SIGNAL(tagChanged(Akonadi::Tag)), this, SLOT(onTagChanged(Akonadi::Tag)));
 }
 
 void TagCache::onTagAdded(const Akonadi::Tag &tag)
 {
     mCache.insert(tag.id(), new Akonadi::Tag(tag));
 }
 
 void TagCache::onTagChanged(const Akonadi::Tag &tag)
 {
     mCache.remove(tag.id());
 }
 
 void TagCache::onTagRemoved(const Akonadi::Tag &tag)
 {
     mCache.remove(tag.id());
 }
 
 void TagCache::retrieveTags(const Akonadi::Tag::List &tags, MessageItemPrivate *m)
 {
     //Retrieval is in progress
     if (mRequests.key(m)) {
         return;
     }
     Akonadi::Tag::List toFetch;
     Akonadi::Tag::List available;
     Q_FOREACH( const Akonadi::Tag &tag, tags ) {
         if (mCache.contains(tag.id())) {
             available << *mCache.object(tag.id());
         } else {
             toFetch << tag;
         }
     }
     //Because fillTagList expects to be called once we either fetch all or none
     if (!toFetch.isEmpty()) {
         Akonadi::TagFetchJob *tagFetchJob = new Akonadi::TagFetchJob(tags, this);
         tagFetchJob->fetchScope().fetchAttribute<Akonadi::TagAttribute>();
         connect(tagFetchJob, SIGNAL(result(KJob*)), this, SLOT(onTagsFetched(KJob*)));
         mRequests.insert(tagFetchJob, m);
     } else {
         m->fillTagList(available);
     }
 }
 
 void TagCache::cancelRequest(MessageItemPrivate *m)
 {
     const QList<KJob*> keys = mRequests.keys(m);
     Q_FOREACH( KJob *job, keys ) {
         mRequests.remove(job);
     }
 }
 
 void TagCache::onTagsFetched(KJob *job)
 {
     if (job->error()) {
         kWarning() << "Failed to fetch tags: " << job->errorString();
         return;
     }
     Akonadi::TagFetchJob *fetchJob = static_cast<Akonadi::TagFetchJob*>(job);
     Q_FOREACH( const Akonadi::Tag &tag, fetchJob->tags() ) {
         mCache.insert(tag.id(), new Akonadi::Tag(tag));
     }
     MessageItemPrivate *m = mRequests.take(fetchJob);
     if (m) {
         m->fillTagList(fetchJob->tags());
     }
 }
diff --git a/messagelist/core/messageitem_p.h b/messagelist/core/messageitem_p.h
index 47f16b8465..dac7b67fac 100644
--- a/messagelist/core/messageitem_p.h
+++ b/messagelist/core/messageitem_p.h
@@ -1,122 +1,120 @@
 /******************************************************************************
  *
  *  Copyright 2008 Szymon Tomasz Stefanek <pragma@kvirc.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  *******************************************************************************/
 
 #ifndef MESSAGELIST_MESSAGEITEM_P_H
 #define MESSAGELIST_MESSAGEITEM_P_H
 
 #include "messageitem.h"
 #include "item_p.h"
-#include "messagecore/widgets/annotationdialog.h"
 #include <Akonadi/Item>
 #include <Akonadi/Monitor>
 #include <Akonadi/Tag>
 #include <KJob>
 #include <QWeakPointer>
 #include <QCache>
 
 namespace MessageList {
 namespace Core {
 
 class MessageItemPrivate : public ItemPrivate
 {
 public:
 
   explicit MessageItemPrivate( MessageItem *qq );
   ~MessageItemPrivate();
 
   /**
    * Linear search in the list of tags. The lists of tags
    * associated to a message are supposed to be very short (c'mon.. you won't add more than a couple of tags to a single msg).
    * so a linear search is better than a hash lookup in most cases.
    */
   const MessageItem::Tag *findTagInternal( const QString &szTagId ) const;
 
   /// Returns the list of tags. This is calculated on demand and cached in mTagList
   QList<MessageItem::Tag*> getTagList() const;
 
   bool tagListInitialized() const;
 
   /// Returns the tag with the highest priority, or 0 if there are no tags
   const MessageItem::Tag* bestTag() const;
 
   /// Deletes the internal list of tags
   void invalidateTagCache();
 
   /// Deletes the cache of the annotation
   void invalidateAnnotationCache();
 
   // This creates mTagList and fills it with useful data
   void fillTagList( const Akonadi::Tag::List &taglist );
 
   QByteArray mMessageIdMD5;            ///< always set
   QByteArray mInReplyToIdMD5;          ///< set only if we're doing threading
   QByteArray mReferencesIdMD5;         ///< set only if we're doing threading
   QByteArray mStrippedSubjectMD5;      ///< set only if we're doing threading
   Akonadi::Item mAkonadiItem;
-  QWeakPointer<MessageCore::AnnotationEditDialog> mAnnotationDialog;
   MessageItem::ThreadingStatus mThreadingStatus : 4;
   MessageItem::EncryptionState mEncryptionState : 4;
   MessageItem::SignatureState mSignatureState : 4;
 
   bool mAboutToBeRemoved : 1;       ///< Set to true when this item is going to be deleted and shouldn't be selectable
   bool mSubjectIsPrefixed : 1;      ///< set only if we're doing subject based threading
 
 private:
 
   // List of all tags. If this is 0, it means we have not yet calculated this list. It is calculated
   // on demand when needed.
   mutable QList< MessageItem::Tag * > * mTagList;
 };
 
 class FakeItemPrivate : public MessageItemPrivate
 {
   public:
     explicit FakeItemPrivate( FakeItem *qq );
     QList<MessageItem::Tag*> mFakeTags;
 };
 
 /**
  * A tag cache
  */
 class TagCache : public QObject
 {
   Q_OBJECT
 public:
   TagCache();
   void retrieveTags(const Akonadi::Tag::List &tags, MessageItemPrivate *m);
   void cancelRequest(MessageItemPrivate *m);
 
 private Q_SLOTS:
   void onTagAdded(const Akonadi::Tag &);
   void onTagChanged(const Akonadi::Tag &);
   void onTagRemoved(const Akonadi::Tag &);
   void onTagsFetched(KJob*);
 
 private:
   QHash<KJob*, MessageItemPrivate*> mRequests;
   QCache<Akonadi::Tag::Id, Akonadi::Tag> mCache;
   Akonadi::Monitor *mMonitor;
 };
 
 }
 
 }
 
 #endif
diff --git a/messageviewer/widgets/noteedit.cpp b/messageviewer/widgets/noteedit.cpp
index 9d9df41e0d..936052a1ae 100644
--- a/messageviewer/widgets/noteedit.cpp
+++ b/messageviewer/widgets/noteedit.cpp
@@ -1,246 +1,246 @@
 /*
   Copyright (c) 2014 Sandro Knauß <knauss@kolabsys.com>*
 
   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License, version 2, as
   published by the Free Software Foundation.
 
   This program is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   General Public License for more details.
 
   You should have received a copy of the GNU General Public License along
   with this program; if not, write to the Free Software Foundation, Inc.,
   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "noteedit.h"
 
 #include "messageviewer/globalsettings_base.h"
 
 #include <KLocalizedString>
 #include <KLineEdit>
 #include <KIcon>
 #include <KDateTimeEdit>
 
 #include <QHBoxLayout>
 #include <QEvent>
 #include <QKeyEvent>
 #include <QLabel>
 
 #include <Akonadi/CollectionComboBox>
 #include <KPushButton>
 
 #include <incidenceeditor-ng/incidencedialogfactory.h>
 #include <incidenceeditor-ng/incidencedialog.h>
 
 namespace MessageViewer {
 MESSAGEVIEWER_EXPORT QAbstractItemModel *_k_noteEditStubModel = 0;
 }
 
 using namespace MessageViewer;
 
 NoteEdit::NoteEdit(QWidget *parent)
     : QWidget(parent)
 {
     QVBoxLayout *vbox = new QVBoxLayout;
     vbox->setMargin(5);
     vbox->setSpacing(2);
     setLayout(vbox);
 
     QHBoxLayout *hbox = new QHBoxLayout;
     hbox->setMargin(0);
     hbox->setSpacing(2);
     vbox->addLayout(hbox);
 
     QLabel *lab = new QLabel(i18n("Note:"));
     hbox->addWidget(lab);
 
     mNoteEdit = new KLineEdit;
     mNoteEdit->setClearButtonShown(true);
     mNoteEdit->setObjectName(QLatin1String("noteedit"));
     mNoteEdit->setFocus();
     connect(mNoteEdit, SIGNAL(returnPressed()), SLOT(slotReturnPressed()));
     connect(mNoteEdit, SIGNAL(textChanged(QString)), SLOT(slotUpdateButtons(QString)));
     hbox->addWidget(mNoteEdit);
 
     hbox->addSpacing(5);
 
     mCollectionCombobox = new Akonadi::CollectionComboBox(_k_noteEditStubModel);
     mCollectionCombobox->setAccessRightsFilter(Akonadi::Collection::CanCreateItem);
     mCollectionCombobox->setMinimumWidth(250);
     mCollectionCombobox->setMimeTypeFilter( QStringList() << Akonadi::NoteUtils::noteMimeType() );
     mCollectionCombobox->setObjectName(QLatin1String("akonadicombobox"));
 #ifndef QT_NO_ACCESSIBILITY
     mCollectionCombobox->setAccessibleDescription(i18n("Calendar where the new event will be stored."));
 #endif
     mCollectionCombobox->setToolTip(i18n("Calendar where the new event will be stored."));
 
     connect(mCollectionCombobox, SIGNAL(currentIndexChanged(int)), SLOT(slotCollectionChanged(int)));
     connect(mCollectionCombobox, SIGNAL(activated(int)), SLOT(slotCollectionChanged(int)));
     hbox->addWidget(mCollectionCombobox);
 
     hbox = new QHBoxLayout;
     hbox->setMargin(0);
     hbox->setSpacing(2);
     vbox->addLayout(hbox);
 
     hbox->addStretch(1);
 
     hbox = new QHBoxLayout;
     hbox->setSpacing(2);
     hbox->setMargin(0);
     vbox->addLayout(hbox);
 
     hbox->addStretch(1);
 
     mSaveButton = new KPushButton(KIcon(QLatin1String("view-pim-notes")), i18n("&Save"));
     mSaveButton->setObjectName(QLatin1String("save-button"));
     mSaveButton->setEnabled(false);
 #ifndef QT_NO_ACCESSIBILITY
     mSaveButton->setAccessibleDescription(i18n("Create new note and close this widget."));
 #endif
     connect(mSaveButton, SIGNAL(clicked(bool)), this, SLOT(slotReturnPressed()));
     hbox->addWidget(mSaveButton);
 
     KPushButton *btn = new KPushButton(KStandardGuiItem::cancel());
     btn->setObjectName(QLatin1String("close-button"));
 #ifndef QT_NO_ACCESSIBILITY
     btn->setAccessibleDescription(i18n("Close the widget for creating new notes."));
 #endif
     connect(btn, SIGNAL(clicked(bool)), this, SLOT(slotCloseWidget()));
     hbox->addWidget(btn);
 
     readConfig();
     setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed ) );
     installEventFilter(this);
     mCollectionCombobox->installEventFilter(this);
 }
 
 NoteEdit::~NoteEdit()
 {
     writeConfig();
 }
 
 void NoteEdit::writeConfig()
 {
     if (mCollectionCombobox->currentCollection().id() != MessageViewer::GlobalSettingsBase::self()->lastNoteSelectedFolder()) {
         MessageViewer::GlobalSettingsBase::self()->setLastNoteSelectedFolder(mCollectionCombobox->currentCollection().id());
         MessageViewer::GlobalSettingsBase::self()->writeConfig();
     }
 }
 
 void NoteEdit::slotUpdateButtons(const QString &subject)
 {
     const bool subjectIsNotEmpty = !subject.isEmpty();
     mSaveButton->setEnabled(subjectIsNotEmpty);
 }
 
 void NoteEdit::showNoteEdit()
 {
     mNoteEdit->setFocus();
     show();
 }
 
 void NoteEdit::readConfig()
 {
     const qint64 id = MessageViewer::GlobalSettingsBase::self()->lastNoteSelectedFolder();
-    if (id!=-1) {
+    if (id != -1) {
         mCollectionCombobox->setDefaultCollection(Akonadi::Collection(id));
     }
 }
 
 Akonadi::Collection NoteEdit::collection() const
 {
     return mCollection;
 }
 
 void NoteEdit::slotCollectionChanged(int /*index*/)
 {
     setCollection(mCollectionCombobox->currentCollection());
 }
 
 void NoteEdit::setCollection(const Akonadi::Collection &value)
 {
     if (mCollection != value) {
         mCollection = value;
         Q_EMIT collectionChanged(mCollection);
     }
 }
 
 KMime::Message::Ptr NoteEdit::message() const
 {
     return mMessage;
 }
 
 void NoteEdit::setMessage(const KMime::Message::Ptr &value)
 {
     if (mMessage != value) {
         mMessage = value;
         const KMime::Headers::Subject * const subject = mMessage ? mMessage->subject(false) : 0;
         if (subject) {
             mNoteEdit->setText(subject->asUnicodeString());
             mNoteEdit->selectAll();
             mNoteEdit->setFocus();
         } else {
             mNoteEdit->clear();
         }
         Q_EMIT messageChanged(mMessage);
     }
 }
 
 void NoteEdit::slotCloseWidget()
 {
     writeConfig();
     mNoteEdit->clear();
     mMessage = KMime::Message::Ptr();
     hide();
 }
 
 void NoteEdit::slotReturnPressed()
 {
     if (!mMessage) {
         kDebug()<<" Message is null";
         return;
     }
     const Akonadi::Collection collection = mCollectionCombobox->currentCollection();
     if (!collection.isValid()) {
         kDebug()<<" Collection is not valid";
         return;
     }
 
     if (!mNoteEdit->text().trimmed().isEmpty()) {
         Akonadi::NoteUtils::NoteMessageWrapper note;
         note.setTitle(mNoteEdit->text());
         Q_EMIT createNote(note.message(), collection);
         mNoteEdit->clear();
         hide();
     }
 }
 
 bool NoteEdit::eventFilter(QObject *object, QEvent *e)
 {
     // Close the bar when pressing Escape.
     // Not using a QShortcut for this because it could conflict with
     // window-global actions (e.g. Emil Sedgh binds Esc to "close tab").
     // With a shortcut override we can catch this before it gets to kactions.
     const bool shortCutOverride = (e->type() == QEvent::ShortcutOverride);
     if (shortCutOverride ) {
         QKeyEvent* kev = static_cast<QKeyEvent* >(e);
         if (kev->key() == Qt::Key_Escape) {
             e->accept();
             slotCloseWidget();
             return true;
         } else if ( kev->key() == Qt::Key_Enter ||
                     kev->key() == Qt::Key_Return ||
                     kev->key() == Qt::Key_Space) {
             e->accept();
             if (object == mCollectionCombobox) {
                 mCollectionCombobox->showPopup();
             }
             return true;
         }
     }
     return QWidget::eventFilter(object,e);
-}
\ No newline at end of file
+}