diff --git a/kmkernel.cpp b/kmkernel.cpp
index 4d631c455..5fb4af063 100644
--- a/kmkernel.cpp
+++ b/kmkernel.cpp
@@ -932,7 +932,8 @@ void KMKernel::setAccountStatus(bool goOnline)
         const QString identifier( type.identifier() );
         if ( PimCommon::Util::isImapResource(identifier) ||
              identifier.contains( POP3_RESOURCE_IDENTIFIER ) ||
-             identifier.contains( QLatin1String("akonadi_maildispatcher_agent") ) ) {
+             identifier.contains( QLatin1String("akonadi_maildispatcher_agent") ) ||
+             type.type().capabilities().contains(QLatin1String("NeedsNetwork")) ) {
             type.setIsOnline( goOnline );
         }
     }