diff --git a/plugins/messageviewer/bodypartformatter/memorycalendarmemento.cpp b/plugins/messageviewer/bodypartformatter/memorycalendarmemento.cpp
index 57f4673dec..e211f17f79 100644
--- a/plugins/messageviewer/bodypartformatter/memorycalendarmemento.cpp
+++ b/plugins/messageviewer/bodypartformatter/memorycalendarmemento.cpp
@@ -1,68 +1,69 @@
 /* Copyright (C) 2010 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.net>
    Author: Sérgio Martins <sergio.martins@kdab.com>
 
    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 "memorycalendarmemento.h"
 
 #include <calendarsupport/calendarsingleton.h>
 #include <akonadi/calendar/etmcalendar.h>
 #include <QTimer>
 #include <KDebug>
 
 using namespace MessageViewer;
 
 MemoryCalendarMemento::MemoryCalendarMemento()
   : QObject( 0 ), mLoaded( false )
 {
   // We reuse the EntityTreeModel from the calendar singleton to save memory.
   // We don't reuse the entire ETMCalendar because we want a different selection model
   mCalendar = Akonadi::ETMCalendar::Ptr( new Akonadi::ETMCalendar( CalendarSupport::calendarSingleton() ) );
+  mCalendar->setCollectionFilteringEnabled(false);
   if (mCalendar->isLoaded()) {
     kDebug() << "Calendar is already loaded.";
     QTimer::singleShot(1, this, SLOT(onCalendarChanged()));
   } else {
     kDebug() << "Waiting for calendar to load.";
     connect(mCalendar.data(), SIGNAL(calendarChanged()), this, SLOT(onCalendarChanged()));
   }
 }
 
 void MemoryCalendarMemento::onCalendarChanged()
 {
   if (mCalendar->isLoaded() && !mLoaded) {
     kDebug() << "Calendar is loaded.";
     mLoaded = true;
     emit update( Viewer::Delayed );
   }
 }
 
 bool MemoryCalendarMemento::finished() const
 {
   return mLoaded;
 }
 
 KCalCore::MemoryCalendar::Ptr MemoryCalendarMemento::calendar() const
 {
   Q_ASSERT( finished() );
   return mCalendar;
 }
 
 void MemoryCalendarMemento::detach()
 {
   disconnect( this, SIGNAL(update(MessageViewer::Viewer::UpdateMode)), 0, 0 );
 }
 
diff --git a/plugins/messageviewer/bodypartformatter/syncitiphandler.cpp b/plugins/messageviewer/bodypartformatter/syncitiphandler.cpp
index 67f6a6e030..98c065ecac 100644
--- a/plugins/messageviewer/bodypartformatter/syncitiphandler.cpp
+++ b/plugins/messageviewer/bodypartformatter/syncitiphandler.cpp
@@ -1,75 +1,78 @@
 /*
   This file is part of kdepim.
 
   Copyright (c) 2013 Sérgio Martins <iamsergio@gmail.com>
 
   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
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
   the Qt library by Trolltech AS, Norway (or with modified versions
   of Qt that use the same license as Qt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
   Qt.  If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
 */
 
 #include "syncitiphandler.h"
 
 #include <calendarsupport/calendarsingleton.h>
 #include <akonadi/calendar/etmcalendar.h>
 
 SyncItipHandler::SyncItipHandler(const QString &receiver, const QString &iCal,
                                  const QString &type, QObject *parent) : QObject(parent)
                                                                        , m_result(Akonadi::ITIPHandler::ResultSuccess)
 {
     Akonadi::ITIPHandler *handler = new Akonadi::ITIPHandler(this);
 
     //We assume it is already loaded, since we already used it in the memorycalendarmemento
     m_calendar = Akonadi::ETMCalendar::Ptr( new Akonadi::ETMCalendar( CalendarSupport::calendarSingleton() ) );
+    m_calendar->setCollectionFilteringEnabled(false);
+    //It can apparently happen that the calendar is empty although already loaded. Allow signals to execute.
+    m_eventLoop.processEvents();
     handler->setCalendar(m_calendar);
 
     QObject::connect(handler, SIGNAL(iTipMessageProcessed(Akonadi::ITIPHandler::Result,QString)),
                      SLOT(onITipMessageProcessed(Akonadi::ITIPHandler::Result,QString)));
 
     m_counterProposalEditorDelegate = new IncidenceEditorNG::GroupwareUiDelegate();
     handler->setGroupwareUiDelegate(m_counterProposalEditorDelegate);
     handler->processiTIPMessage(receiver, iCal, type);
 
     m_eventLoop.exec();
 }
 
 void SyncItipHandler::onITipMessageProcessed(Akonadi::ITIPHandler::Result result, const QString &errorMessage)
 {
     m_result = result;
     m_errorMessage = errorMessage;
     m_eventLoop.exit();
     deleteLater();
     delete m_counterProposalEditorDelegate;
     m_counterProposalEditorDelegate = 0;
 }
 
 QString SyncItipHandler::errorMessage() const
 {
     return m_errorMessage;
 }
 
 Akonadi::ITIPHandler::Result SyncItipHandler::result() const
 {
     return m_result;
 }