diff --git a/mailtransport/outboxactions.cpp b/mailtransport/outboxactions.cpp
index 68bd5ee1f..a07182892 100644
--- a/mailtransport/outboxactions.cpp
+++ b/mailtransport/outboxactions.cpp
@@ -1,151 +1,154 @@
 /*
     Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This library 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 Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 
 #include "outboxactions_p.h"
 
 #include "dispatchmodeattribute.h"
 #include "errorattribute.h"
 
 #include <akonadi/itemmodifyjob.h>
 
 using namespace Akonadi;
 using namespace MailTransport;
 
 class MailTransport::SendQueuedAction::Private
 {
 };
 
 SendQueuedAction::SendQueuedAction()
   : d( new Private )
 {
 }
 
 SendQueuedAction::~SendQueuedAction()
 {
   delete d;
 }
 
 ItemFetchScope SendQueuedAction::fetchScope() const
 {
   ItemFetchScope scope;
   scope.fetchFullPayload( false );
   scope.fetchAttribute<DispatchModeAttribute>();
+  scope.setCacheOnly( true );
   return scope;
 }
 
 bool SendQueuedAction::itemAccepted( const Item &item ) const
 {
   if( !item.hasAttribute<DispatchModeAttribute>() ) {
     kWarning() << "Item doesn't have DispatchModeAttribute.";
     return false;
   }
 
   return item.attribute<DispatchModeAttribute>()->dispatchMode() == DispatchModeAttribute::Manual;
 }
 
 Job *SendQueuedAction::itemAction( const Item &item, FilterActionJob *parent ) const
 {
   Item cp = item;
   cp.addAttribute( new DispatchModeAttribute ); // defaults to Automatic
   return new ItemModifyJob( cp, parent );
 }
 
 class MailTransport::ClearErrorAction::Private
 {
 };
 
 ClearErrorAction::ClearErrorAction()
   : d( new Private )
 {
 }
 
 ClearErrorAction::~ClearErrorAction()
 {
   delete d;
 }
 
 ItemFetchScope ClearErrorAction::fetchScope() const
 {
   ItemFetchScope scope;
   scope.fetchFullPayload( false );
   scope.fetchAttribute<ErrorAttribute>();
+  scope.setCacheOnly( true );
   return scope;
 }
 
 bool ClearErrorAction::itemAccepted( const Item &item ) const
 {
   return item.hasAttribute<ErrorAttribute>();
 }
 
 Job *ClearErrorAction::itemAction( const Item &item, FilterActionJob *parent ) const
 {
   Item cp = item;
   cp.removeAttribute<ErrorAttribute>();
   cp.clearFlag( "error" );
   cp.setFlag( "queued" );
   return new ItemModifyJob( cp, parent );
 }
 
 class MailTransport::DispatchManualTransportAction::Private
 {
 };
 
 DispatchManualTransportAction::DispatchManualTransportAction( int transportId )
   : d( new Private ), mTransportId( transportId )
 {
 }
 
 DispatchManualTransportAction::~DispatchManualTransportAction()
 {
   delete d;
 }
 
 ItemFetchScope DispatchManualTransportAction::fetchScope() const
 {
   ItemFetchScope scope;
   scope.fetchFullPayload( false );
   scope.fetchAttribute<TransportAttribute>();
   scope.fetchAttribute<DispatchModeAttribute>();
+  scope.setCacheOnly( true );
   return scope;
 }
 
 bool DispatchManualTransportAction::itemAccepted( const Item &item ) const
 {
   if( !item.hasAttribute<DispatchModeAttribute>() ) {
     kWarning() << "Item doesn't have DispatchModeAttribute.";
     return false;
   }
 
   if( !item.hasAttribute<TransportAttribute>() ) {
     kWarning() << "Item doesn't have TransportAttribute.";
     return false;
   }
 
   return item.attribute<DispatchModeAttribute>()->dispatchMode() == DispatchModeAttribute::Manual;
 }
 
 Job *DispatchManualTransportAction::itemAction( const Item &item, FilterActionJob *parent ) const
 {
   Item cp = item;
   cp.attribute<TransportAttribute>()->setTransportId( mTransportId );
   cp.removeAttribute<DispatchModeAttribute>();
   cp.addAttribute( new DispatchModeAttribute ); // defaults to Automatic
   cp.setFlag( "queued" );
   return new ItemModifyJob( cp, parent );
 }