diff --git a/akonadi/collectionfetchjob.cpp b/akonadi/collectionfetchjob.cpp
index e1d290986..60e8102bd 100644
--- a/akonadi/collectionfetchjob.cpp
+++ b/akonadi/collectionfetchjob.cpp
@@ -1,263 +1,272 @@
 /*
     Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
 
     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 "collectionfetchjob.h"
 
 #include "imapparser_p.h"
 #include "job_p.h"
 #include "protocol_p.h"
 #include "protocolhelper_p.h"
 #include "entity_p.h"
 #include "collectionfetchscope.h"
+#include "collectionutils_p.h"
 
 #include <kdebug.h>
 
 #include <QtCore/QHash>
 #include <QtCore/QStringList>
 #include <QtCore/QTimer>
 
 using namespace Akonadi;
 
 class Akonadi::CollectionFetchJobPrivate : public JobPrivate
 {
   public:
     CollectionFetchJobPrivate( CollectionFetchJob *parent )
       : JobPrivate( parent )
     {
     }
 
     Q_DECLARE_PUBLIC( CollectionFetchJob )
 
     CollectionFetchJob::Type mType;
     Collection mBase;
     Collection::List mBaseList;
     Collection::List mCollections;
     CollectionFetchScope mScope;
     Collection::List mPendingCollections;
     QTimer *mEmitTimer;
 
     void timeout()
     {
       Q_Q( CollectionFetchJob );
 
       mEmitTimer->stop(); // in case we are called by result()
       if ( !mPendingCollections.isEmpty() ) {
         emit q->collectionsReceived( mPendingCollections );
         mPendingCollections.clear();
       }
     }
 };
 
 CollectionFetchJob::CollectionFetchJob( const Collection &collection, Type type, QObject *parent )
   : Job( new CollectionFetchJobPrivate( this ), parent )
 {
   Q_D( CollectionFetchJob );
 
   d->mBase = collection;
   d->mType = type;
 
   d->mEmitTimer = new QTimer( this );
   d->mEmitTimer->setSingleShot( true );
   d->mEmitTimer->setInterval( 100 );
   connect( d->mEmitTimer, SIGNAL(timeout()), this, SLOT(timeout()) );
   connect( this, SIGNAL(result(KJob*)), this, SLOT(timeout()) );
 }
 
 CollectionFetchJob::CollectionFetchJob( const Collection::List & cols, QObject * parent )
   : Job( new CollectionFetchJobPrivate( this ), parent )
 {
   Q_D( CollectionFetchJob );
 
   Q_ASSERT( !cols.isEmpty() );
   if ( cols.size() == 1 ) {
     d->mBase = cols.first();
     d->mType = CollectionFetchJob::Base;
   } else {
     d->mBaseList = cols;
   }
 
   d->mEmitTimer = new QTimer( this );
   d->mEmitTimer->setSingleShot( true );
   d->mEmitTimer->setInterval( 100 );
   connect( d->mEmitTimer, SIGNAL(timeout()), this, SLOT(timeout()) );
   connect( this, SIGNAL(result(KJob*)), this, SLOT(timeout()) );
 }
 
 CollectionFetchJob::~CollectionFetchJob()
 {
 }
 
 Collection::List CollectionFetchJob::collections() const
 {
   Q_D( const CollectionFetchJob );
 
   return d->mCollections;
 }
 
 void CollectionFetchJob::doStart()
 {
   Q_D( CollectionFetchJob );
 
   if ( !d->mBaseList.isEmpty() ) {
     foreach ( const Collection &col, d->mBaseList ) {
       CollectionFetchJob *subJob = new CollectionFetchJob( col, CollectionFetchJob::Base, this );
       subJob->setFetchScope( fetchScope() );
     }
     return;
   }
 
   if ( !d->mBase.isValid() && d->mBase.remoteId().isEmpty() ) {
     setError( Unknown );
     setErrorText( QLatin1String( "Invalid collection given." ) );
     emitResult();
     return;
   }
 
   QByteArray command = d->newTag();
-  if ( !d->mBase.isValid() )
-    command += " " AKONADI_CMD_RID;
+  if ( !d->mBase.isValid() ) {
+    if ( CollectionUtils::hasValidHierarchicalRID( d->mBase ) )
+      command += " HRID";
+    else
+      command += " " AKONADI_CMD_RID;
+  }
   if ( d->mScope.includeUnubscribed() )
     command += " LIST ";
   else
     command += " LSUB ";
+
   if ( d->mBase.isValid() )
     command += QByteArray::number( d->mBase.id() );
+  else if ( CollectionUtils::hasValidHierarchicalRID( d->mBase ) )
+    command += '(' + ProtocolHelper::hierarchicalRidToByteArray( d->mBase ) + ')';
   else
     command += ImapParser::quote( d->mBase.remoteId().toUtf8() );
+
   command += ' ';
   switch ( d->mType ) {
     case Base:
       command += "0 (";
       break;
     case FirstLevel:
       command += "1 (";
       break;
     case Recursive:
       command += "INF (";
       break;
     default:
       Q_ASSERT( false );
   }
 
   QList<QByteArray> filter;
   if ( !d->mScope.resource().isEmpty() ) {
     filter.append( "RESOURCE" );
     filter.append( d->mScope.resource().toUtf8() );
   }
 
   if ( !d->mScope.contentMimeTypes().isEmpty() ) {
     filter.append( "MIMETYPE" );
     QList<QByteArray> mts;
     foreach ( const QString &mt, d->mScope.contentMimeTypes() )
       mts.append( mt.toUtf8() );
     filter.append( '(' + ImapParser::join( mts, " " ) + ')' );
   }
 
   QList<QByteArray> options;
   if ( d->mScope.includeStatistics() ) {
     options.append( "STATISTICS" );
     options.append( "true" );
   }
   if ( d->mScope.ancestorRetrieval() != CollectionFetchScope::None ) {
     options.append( "ANCESTORS" );
     switch ( d->mScope.ancestorRetrieval() ) {
       case CollectionFetchScope::None:
         options.append( "0" );
         break;
       case CollectionFetchScope::Parent:
         options.append( "1" );
         break;
       case CollectionFetchScope::All:
         options.append( "INF" );
         break;
       default:
         Q_ASSERT( false );
     }
   }
 
   command += ImapParser::join( filter, " " ) + ") (" + ImapParser::join( options, " " ) + ")\n";
   d->writeData( command );
 }
 
 void CollectionFetchJob::doHandleResponse( const QByteArray & tag, const QByteArray & data )
 {
   Q_D( CollectionFetchJob );
 
   if ( tag == "*" ) {
     Collection collection;
     ProtocolHelper::parseCollection( data, collection );
     if ( !collection.isValid() )
       return;
 
     collection.d_ptr->resetChangeLog();
     d->mCollections.append( collection );
     d->mPendingCollections.append( collection );
     if ( !d->mEmitTimer->isActive() )
       d->mEmitTimer->start();
     return;
   }
   kDebug() << "Unhandled server response" << tag << data;
 }
 
 void CollectionFetchJob::setResource(const QString & resource)
 {
   Q_D( CollectionFetchJob );
 
   d->mScope.setResource( resource );
 }
 
 void CollectionFetchJob::slotResult(KJob * job)
 {
   Q_D( CollectionFetchJob );
 
   CollectionFetchJob *list = dynamic_cast<CollectionFetchJob*>( job );
   Q_ASSERT( job );
   d->mCollections += list->collections();
   Job::slotResult( job );
   if ( !job->error() && !hasSubjobs() )
     emitResult();
 }
 
 void CollectionFetchJob::includeUnsubscribed(bool include)
 {
   Q_D( CollectionFetchJob );
 
   d->mScope.setIncludeUnsubscribed( include );
 }
 
 void CollectionFetchJob::includeStatistics(bool include)
 {
   Q_D( CollectionFetchJob );
 
   d->mScope.setIncludeStatistics( include );
 }
 
 void CollectionFetchJob::setFetchScope( const CollectionFetchScope &scope )
 {
   Q_D( CollectionFetchJob );
   d->mScope = scope;
 }
 
 CollectionFetchScope& CollectionFetchJob::fetchScope()
 {
   Q_D( CollectionFetchJob );
   return d->mScope;
 }
 
 #include "collectionfetchjob.moc"
diff --git a/akonadi/session_p.h b/akonadi/session_p.h
index 7c889327d..80624b2f3 100644
--- a/akonadi/session_p.h
+++ b/akonadi/session_p.h
@@ -1,115 +1,115 @@
 /*
     Copyright (c) 2007 Volker Krause <vkrause@kde.org>
 
     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.
 */
 
 #ifndef AKONADI_SESSION_P_H
 #define AKONADI_SESSION_P_H
 
 #include "session.h"
 #include "imapparser_p.h"
 
 #include <QtNetwork/QLocalSocket>
 
 #include <QtCore/QQueue>
 #include <QtCore/QSettings>
 #include <QtCore/QThreadStorage>
 
 class QLocalSocket;
 
 namespace Akonadi {
 
 /**
  * @internal
  */
 class SessionPrivate
 {
   public:
     SessionPrivate( Session *parent )
       : mParent( parent ), mConnectionSettings( 0 ), protocolVersion( 0 )
     {
       parser = new ImapParser();
     }
 
     ~SessionPrivate()
     {
       delete parser;
       delete mConnectionSettings;
     }
 
     void startNext();
     void reconnect();
     void socketDisconnected();
     void socketError( QLocalSocket::LocalSocketError error );
     void dataReceived();
     void doStartNext();
     void startJob( Job* job );
     void jobDone( KJob* job );
     void jobWriteFinished( Akonadi::Job* job );
     void jobDestroyed( QObject *job );
 
     bool canPipelineNext();
 
     /**
      * Creates a new default session for this thread with
      * the given @p sessionId. The session can be accessed
      * later by defaultSession().
      *
      * You only need to call this method if you want that the
      * default session has a special custom id, otherwise a random unique
      * id is used automatically.
      */
     static void createDefaultSession( const QByteArray &sessionId );
 
     /**
       Associates the given Job object with this session.
     */
     void addJob( Job* job );
 
     /**
       Returns the next IMAP tag.
     */
     int nextTag();
 
     /**
       Sends the given raw data.
     */
     void writeData( const QByteArray &data );
 
-    static int minimumProtocolVersion() { return 19; }
+    static int minimumProtocolVersion() { return 20; }
 
     Session *mParent;
     QByteArray sessionId;
     QSettings *mConnectionSettings;
     QLocalSocket* socket;
     bool connected;
     int theNextTag;
     int protocolVersion;
 
     // job management
     QQueue<Job*> queue;
     QQueue<Job*> pipeline;
     Job* currentJob;
     bool jobRunning;
 
     // parser stuff
     ImapParser *parser;
 };
 
 }
 
 #endif
diff --git a/akonadi/tests/collectionjobtest.cpp b/akonadi/tests/collectionjobtest.cpp
index 4ec0d05d9..acf0bfdb6 100644
--- a/akonadi/tests/collectionjobtest.cpp
+++ b/akonadi/tests/collectionjobtest.cpp
@@ -1,643 +1,654 @@
 /*
     Copyright (c) 2006 Volker Krause <vkrause@kde.org>
 
     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 <sys/types.h>
 
 #include "collectionjobtest.h"
 #include <qtest_akonadi.h>
 #include "test_utils.h"
 #include "testattribute.h"
 
 #include "agentmanager.h"
 #include "agentinstance.h"
 #include "attributefactory.h"
 #include "cachepolicy.h"
 #include "collection.h"
 #include "collectioncreatejob.h"
 #include "collectiondeletejob.h"
 #include "collectionfetchjob.h"
 #include "collectionmodifyjob.h"
 #include "collectionselectjob_p.h"
 #include "collectionstatistics.h"
 #include "collectionstatisticsjob.h"
 #include "collectionpathresolver_p.h"
 #include "collectionutils_p.h"
 #include "control.h"
 #include "item.h"
 #include "kmime/messageparts.h"
 #include "resourceselectjob_p.h"
 #include "collectionfetchscope.h"
 
 #include <QDBusConnection>
 #include <QDBusConnectionInterface>
 
 
 using namespace Akonadi;
 
 QTEST_AKONADIMAIN( CollectionJobTest, NoGUI )
 
 void CollectionJobTest::initTestCase()
 {
   qRegisterMetaType<Akonadi::Collection::List>();
   AttributeFactory::registerAttribute<TestAttribute>();
   Control::start();
 
   // switch all resources offline to reduce interference from them
   foreach ( Akonadi::AgentInstance agent, Akonadi::AgentManager::self()->instances() )
     agent.setIsOnline( false );
 }
 
 static Collection findCol( const Collection::List &list, const QString &name ) {
   foreach ( const Collection &col, list )
     if ( col.name() == name )
       return col;
   return Collection();
 }
 
 // list compare which ignores the order
 template <class T> static void compareLists( const QList<T> &l1, const QList<T> &l2 )
 {
   QCOMPARE( l1.count(), l2.count() );
   foreach ( const T entry, l1 ) {
     QVERIFY( l2.contains( entry ) );
   }
 }
 
 template <typename T> static T* extractAttribute( QList<Attribute*> attrs )
 {
   T dummy;
   foreach ( Attribute* attr, attrs ) {
     if ( attr->type() == dummy.type() )
       return dynamic_cast<T*>( attr );
   }
   return 0;
 }
 
 static Collection::Id res1ColId = 6; // -1;
 static Collection::Id res2ColId = 7; //-1;
 static Collection::Id res3ColId = -1;
 static Collection::Id searchColId = -1;
 
 void CollectionJobTest::testTopLevelList( )
 {
   // non-recursive top-level list
   CollectionFetchJob *job = new CollectionFetchJob( Collection::root(), CollectionFetchJob::FirstLevel );
   QVERIFY( job->exec() );
   Collection::List list = job->collections();
 
   // check if everything is there and has the correct types and attributes
   QCOMPARE( list.count(), 4 );
   Collection col;
 
   col = findCol( list, "res1" );
   QVERIFY( col.isValid() );
   res1ColId = col.id(); // for the next test
   QVERIFY( res1ColId > 0 );
   QVERIFY( CollectionUtils::isResource( col ) );
   QCOMPARE( col.parentCollection(), Collection::root() );
   QCOMPARE( col.resource(), QLatin1String("akonadi_knut_resource_0") );
 
   QVERIFY( findCol( list, "res2" ).isValid() );
   res2ColId = findCol( list, "res2" ).id();
   QVERIFY( res2ColId > 0 );
   QVERIFY( findCol( list, "res3" ).isValid() );
   res3ColId = findCol( list, "res3" ).id();
   QVERIFY( res3ColId > 0 );
 
   col = findCol( list, "Search" );
   searchColId = col.id();
   QVERIFY( col.isValid() );
   QVERIFY( CollectionUtils::isVirtualParent( col ) );
   QCOMPARE( col.resource(), QLatin1String("akonadi_search_resource") );
 }
 
 void CollectionJobTest::testFolderList( )
 {
   // recursive list of physical folders
   CollectionFetchJob *job = new CollectionFetchJob( Collection( res1ColId ), CollectionFetchJob::Recursive );
   QSignalSpy spy( job, SIGNAL(collectionsReceived(Akonadi::Collection::List)) );
   QVERIFY( spy.isValid() );
   QVERIFY( job->exec() );
   Collection::List list = job->collections();
 
   int count = 0;
   for ( int i = 0; i < spy.count(); ++i ) {
     Collection::List l = spy[i][0].value<Akonadi::Collection::List>();
     for ( int j = 0; j < l.count(); ++j ) {
       QVERIFY( list.count() > count + j );
       QCOMPARE( list[count + j].id(), l[j].id() );
     }
     count += l.count();
   }
   QCOMPARE( count, list.count() );
 
   // check if everything is there
   QCOMPARE( list.count(), 4 );
   Collection col;
   QStringList contentTypes;
 
   col = findCol( list, "foo" );
   QVERIFY( col.isValid() );
   QCOMPARE( col.parentCollection().id(), res1ColId );
   QVERIFY( CollectionUtils::isFolder( col ) );
   contentTypes << "message/rfc822" << "text/calendar" << "text/directory"
                << "application/octet-stream" << "inode/directory";
   compareLists( col.contentMimeTypes(), contentTypes );
 
   QVERIFY( findCol( list, "bar" ).isValid() );
   QCOMPARE( findCol( list, "bar" ).parentCollection(), col );
   QVERIFY( findCol( list, "bla" ).isValid() );
 }
 
 void CollectionJobTest::testNonRecursiveFolderList( )
 {
   CollectionFetchJob *job = new CollectionFetchJob( Collection( res1ColId ), CollectionFetchJob::Base );
   QVERIFY( job->exec() );
   Collection::List list = job->collections();
 
   QCOMPARE( list.count(), 1 );
   QVERIFY( findCol( list, "res1" ).isValid() );
 }
 
 void CollectionJobTest::testEmptyFolderList( )
 {
   CollectionFetchJob *job = new CollectionFetchJob( Collection( res3ColId ), CollectionFetchJob::FirstLevel );
   QVERIFY( job->exec() );
   Collection::List list = job->collections();
 
   QCOMPARE( list.count(), 0 );
 }
 
 void CollectionJobTest::testSearchFolderList( )
 {
   CollectionFetchJob *job = new CollectionFetchJob( Collection( searchColId ), CollectionFetchJob::FirstLevel );
   QVERIFY( job->exec() );
   Collection::List list = job->collections();
 
   QCOMPARE( list.count(), 0 );
 }
 
 void CollectionJobTest::testResourceFolderList()
 {
   // non-existing resource
   CollectionFetchJob *job = new CollectionFetchJob( Collection::root(), CollectionFetchJob::FirstLevel );
   job->fetchScope().setResource( "i_dont_exist" );
   QVERIFY( !job->exec() );
 
   // recursive listing of all collections of an existing resource
   job = new CollectionFetchJob( Collection::root(), CollectionFetchJob::Recursive );
   job->fetchScope().setResource( "akonadi_knut_resource_0" );
   QVERIFY( job->exec() );
 
   Collection::List list = job->collections();
   QCOMPARE( list.count(), 5 );
   QVERIFY( findCol( list, "res1" ).isValid() );
   QVERIFY( findCol( list, "foo" ).isValid() );
   QVERIFY( findCol( list, "bar" ).isValid() );
   QVERIFY( findCol( list, "bla" ).isValid() );
   int fooId = findCol( list, "foo" ).id();
 
   // limited listing of a resource
   job = new CollectionFetchJob( Collection( fooId ), CollectionFetchJob::Recursive );
   job->fetchScope().setResource( "akonadi_knut_resource_0" );
   QVERIFY( job->exec() );
 
   list = job->collections();
   QCOMPARE( list.count(), 3 );
   QVERIFY( findCol( list, "bar" ).isValid() );
   QVERIFY( findCol( list, "bla" ).isValid() );
 }
 
 void CollectionJobTest::testMimeTypeFilter()
 {
   CollectionFetchJob *job = new CollectionFetchJob( Collection::root(), CollectionFetchJob::Recursive );
   job->fetchScope().setContentMimeTypes( QStringList() << "message/rfc822" );
   AKVERIFYEXEC( job );
 
   Collection::List list = job->collections();
   QCOMPARE( list.count(), 2 );
   QVERIFY( findCol( list, "res1" ).isValid() );
   QVERIFY( findCol( list, "foo" ).isValid() );
   int fooId = findCol( list, "foo" ).id();
 
   // limited listing of a resource
   job = new CollectionFetchJob( Collection( fooId ), CollectionFetchJob::Recursive );
   job->fetchScope().setContentMimeTypes( QStringList() << "message/rfc822" );
   AKVERIFYEXEC( job );
 
   list = job->collections();
   QCOMPARE( list.count(), 0 );
 }
 
 void CollectionJobTest::testCreateDeleteFolder_data()
 {
   QTest::addColumn<Collection>("collection");
   QTest::addColumn<bool>("creatable");
 
   Collection col;
   QTest::newRow("empty") << col << false;
   col.setName( "new folder" );
   col.parentCollection().setId( res3ColId );
   QTest::newRow("simple") << col << true;
 
   col.parentCollection().setId( res3ColId );
   col.setName( "foo" );
   QTest::newRow( "existing in different resource" ) << col << true;
 
   col.setName( "mail folder" );
   QStringList mimeTypes;
   mimeTypes << "inode/directory" << "message/rfc822";
   col.setContentMimeTypes( mimeTypes );
   col.setRemoteId( "remote id" );
   CachePolicy policy;
   policy.setInheritFromParent( false );
   policy.setIntervalCheckTime( 60 );
   policy.setLocalParts( QStringList( MessagePart::Envelope ) );
   policy.setSyncOnDemand( true );
   policy.setCacheTimeout( 120 );
   col.setCachePolicy( policy );
   QTest::newRow( "complex" ) << col << true;
 
   col = Collection();
   col.setName( "New Folder" );
   col.parentCollection().setId( searchColId );
   QTest::newRow( "search folder" ) << col << false;
 
   col.parentCollection().setId( res2ColId );
   col.setName( "foo2" );
   QTest::newRow( "already existing" ) << col << false;
 
   col.setName( "Bla" );
   col.parentCollection().setId( 2 );
   QTest::newRow( "already existing with different case" ) << col << true;
 
   CollectionPathResolver *resolver = new CollectionPathResolver( "res2/foo2", this );
   QVERIFY( resolver->exec() );
   col.parentCollection().setId( resolver->collection() );
   col.setName( "new folder" );
   QTest::newRow( "parent noinferior" ) << col << false;
 
   col.parentCollection().setId( INT_MAX );
   QTest::newRow( "missing parent" ) << col << false;
 
   col = Collection();
   col.setName( "rid parent" );
   col.parentCollection().setRemoteId( "8" );
   QTest::newRow( "rid parent" ) << col << false; // missing resource context
 }
 
 void CollectionJobTest::testCreateDeleteFolder()
 {
   QFETCH( Collection, collection );
   QFETCH( bool, creatable );
 
   CollectionCreateJob *createJob = new CollectionCreateJob( collection, this );
   QCOMPARE( createJob->exec(), creatable );
   if ( !creatable )
     return;
 
   Collection createdCol = createJob->collection();
   QVERIFY( createdCol.isValid() );
   QCOMPARE( createdCol.name(), collection.name() );
   QCOMPARE( createdCol.parentCollection(), collection.parentCollection() );
   QCOMPARE( createdCol.remoteId(), collection.remoteId() );
   QCOMPARE( createdCol.cachePolicy(), collection.cachePolicy() );
 
   CollectionFetchJob *listJob = new CollectionFetchJob( collection.parentCollection(), CollectionFetchJob::FirstLevel, this );
   AKVERIFYEXEC( listJob );
   Collection listedCol = findCol( listJob->collections(), collection.name() );
   QCOMPARE( listedCol, createdCol );
   QCOMPARE( listedCol.remoteId(), collection.remoteId() );
   QCOMPARE( listedCol.cachePolicy(), collection.cachePolicy() );
 
   // fetch parent to compare inherited collection properties
   Collection parentCol = Collection::root();
   if ( collection.parentCollection().isValid() ) {
     CollectionFetchJob *listJob = new CollectionFetchJob( collection.parentCollection(), CollectionFetchJob::Base, this );
     AKVERIFYEXEC( listJob );
     QCOMPARE( listJob->collections().count(), 1 );
     parentCol = listJob->collections().first();
   }
 
   if ( collection.contentMimeTypes().isEmpty() )
     compareLists( listedCol.contentMimeTypes(), parentCol.contentMimeTypes() );
   else
     compareLists( listedCol.contentMimeTypes(), collection.contentMimeTypes() );
 
   if ( collection.resource().isEmpty() )
     QCOMPARE( listedCol.resource(), parentCol.resource() );
   else
     QCOMPARE( listedCol.resource(), collection.resource() );
 
   CollectionDeleteJob *delJob = new CollectionDeleteJob( createdCol, this );
   AKVERIFYEXEC( delJob );
 
   listJob = new CollectionFetchJob( collection.parentCollection(), CollectionFetchJob::FirstLevel, this );
   AKVERIFYEXEC( listJob );
   QVERIFY( !findCol( listJob->collections(), collection.name() ).isValid() );
 }
 
 void CollectionJobTest::testIllegalDeleteFolder()
 {
   // non-existing folder
   CollectionDeleteJob *del = new CollectionDeleteJob( Collection( INT_MAX ), this );
   QVERIFY( !del->exec() );
 
   // root
   del = new CollectionDeleteJob( Collection::root(), this );
   QVERIFY( !del->exec() );
 }
 
 void CollectionJobTest::testStatistics()
 {
   // empty folder
   CollectionStatisticsJob *statistics =
                    new CollectionStatisticsJob( Collection( res1ColId ), this );
   QVERIFY( statistics->exec() );
 
   CollectionStatistics s = statistics->statistics();
   QCOMPARE( s.count(), 0ll );
   QCOMPARE( s.unreadCount(), 0ll );
 
   // folder with attributes and content
   CollectionPathResolver *resolver = new CollectionPathResolver( "res1/foo", this );;
   QVERIFY( resolver->exec() );
   statistics = new CollectionStatisticsJob( Collection( resolver->collection() ), this );
   QVERIFY( statistics->exec() );
 
   s = statistics->statistics();
   QCOMPARE( s.count(), 15ll );
   QCOMPARE( s.unreadCount(), 14ll );
 }
 
 void CollectionJobTest::testModify_data()
 {
   QTest::addColumn<qint64>( "uid" );
   QTest::addColumn<QString>( "rid" );
 
   QTest::newRow( "uid" ) << collectionIdFromPath( "res1/foo" ) << QString();
   QTest::newRow( "rid" ) << -1ll << QString( "10" );
 }
 
 #define RESET_COLLECTION_ID \
   col.setId( uid ); \
   if ( !rid.isEmpty() ) col.setRemoteId( rid )
 
 void CollectionJobTest::testModify()
 {
   QFETCH( qint64, uid );
   QFETCH( QString, rid );
 
   if ( !rid.isEmpty() ) {
     ResourceSelectJob *rjob = new ResourceSelectJob( "akonadi_knut_resource_0" );
     AKVERIFYEXEC( rjob );
   }
 
   QStringList reference;
   reference << "text/calendar" << "text/directory" << "message/rfc822" << "application/octet-stream" << "inode/directory";
 
   Collection col;
   RESET_COLLECTION_ID;
 
   // test noop modify
   CollectionModifyJob *mod = new CollectionModifyJob( col, this );
   AKVERIFYEXEC( mod );
 
   CollectionFetchJob* ljob = new CollectionFetchJob( col, CollectionFetchJob::Base, this );
   AKVERIFYEXEC( ljob );
   QCOMPARE( ljob->collections().count(), 1 );
   col = ljob->collections().first();
   compareLists( col.contentMimeTypes(), reference );
 
   // test clearing content types
   RESET_COLLECTION_ID;
   col.setContentMimeTypes( QStringList() );
   mod = new CollectionModifyJob( col, this );
   AKVERIFYEXEC( mod );
 
   ljob = new CollectionFetchJob( col, CollectionFetchJob::Base, this );
   AKVERIFYEXEC( ljob );
   QCOMPARE( ljob->collections().count(), 1 );
   col = ljob->collections().first();
   QVERIFY( col.contentMimeTypes().isEmpty() );
 
   // test setting contnet types
   RESET_COLLECTION_ID;
   col.setContentMimeTypes( reference );
   mod = new CollectionModifyJob( col, this );
   AKVERIFYEXEC( mod );
 
   ljob = new CollectionFetchJob( col, CollectionFetchJob::Base, this );
   AKVERIFYEXEC( ljob );
   QCOMPARE( ljob->collections().count(), 1 );
   col = ljob->collections().first();
   compareLists( col.contentMimeTypes(), reference );
 
   // add attribute
   RESET_COLLECTION_ID;
   col.attribute<TestAttribute>( Collection::AddIfMissing )->data = "new";
   mod = new CollectionModifyJob( col, this );
   AKVERIFYEXEC( mod );
 
   ljob = new CollectionFetchJob( col, CollectionFetchJob::Base, this );
   AKVERIFYEXEC( ljob );
   QVERIFY( ljob->collections().first().hasAttribute<TestAttribute>() );
   QCOMPARE( ljob->collections().first().attribute<TestAttribute>()->data, QByteArray( "new" ) );
 
   // modify existing attribute
   RESET_COLLECTION_ID;
   col.attribute<TestAttribute>()->data = "modified";
   mod = new CollectionModifyJob( col, this );
   AKVERIFYEXEC( mod );
 
   ljob = new CollectionFetchJob( col, CollectionFetchJob::Base, this );
   AKVERIFYEXEC( ljob );
   QVERIFY( ljob->collections().first().hasAttribute<TestAttribute>() );
   QCOMPARE( ljob->collections().first().attribute<TestAttribute>()->data, QByteArray( "modified" ) );
 
   // renaming
   RESET_COLLECTION_ID;
   col.setName( "foo (renamed)" );
   mod = new CollectionModifyJob( col, this );
   AKVERIFYEXEC( mod );
 
   ljob = new CollectionFetchJob( col, CollectionFetchJob::Base, this );
   AKVERIFYEXEC( ljob );
   QCOMPARE( ljob->collections().count(), 1 );
   col = ljob->collections().first();
   QCOMPARE( col.name(), QString( "foo (renamed)" ) );
 
   RESET_COLLECTION_ID;
   col.setName( "foo" );
   mod = new CollectionModifyJob( col, this );
   AKVERIFYEXEC( mod );
 }
 
 #undef RESET_COLLECTION_ID
 
 void CollectionJobTest::testIllegalModify()
 {
   // non-existing collection
   Collection col( INT_MAX );
   col.parentCollection().setId( res1ColId );
   CollectionModifyJob *mod = new CollectionModifyJob( col, this );
   QVERIFY( !mod->exec() );
 
   // rename to already existing name
   col = Collection( res1ColId );
   col.setName( "res2" );
   mod = new CollectionModifyJob( col, this );
   QVERIFY( !mod->exec() );
 }
 
 void CollectionJobTest::testUtf8CollectionName()
 {
   QString folderName = QString::fromUtf8( "ä" );
 
   // create collection
   Collection col;
   col.parentCollection().setId( res3ColId );
   col.setName( folderName );
   CollectionCreateJob *create = new CollectionCreateJob( col, this );
   QVERIFY( create->exec() );
   col = create->collection();
   QVERIFY( col.isValid() );
 
   // list parent
   CollectionFetchJob *list = new CollectionFetchJob( Collection( res3ColId ), CollectionFetchJob::Recursive, this );
   QVERIFY( list->exec() );
   QCOMPARE( list->collections().count(), 1 );
   QCOMPARE( col, list->collections().first() );
   QCOMPARE( col.name(), folderName );
 
   // modify collection
   col.setContentMimeTypes( QStringList( "message/rfc822'" ) );
   CollectionModifyJob *modify = new CollectionModifyJob( col, this );
   QVERIFY( modify->exec() );
 
   // collection statistics
   CollectionStatisticsJob *statistics = new CollectionStatisticsJob( col, this );
   QVERIFY( statistics->exec() );
   CollectionStatistics s = statistics->statistics();
   QCOMPARE( s.count(), 0ll );
   QCOMPARE( s.unreadCount(), 0ll );
 
   // delete collection
   CollectionDeleteJob *del = new CollectionDeleteJob( col, this );
   QVERIFY( del->exec() );
 }
 
 void CollectionJobTest::testMultiList()
 {
   Collection::List req;
   req << Collection( res1ColId ) << Collection( res2ColId );
   CollectionFetchJob* job = new CollectionFetchJob( req, this );
   QVERIFY( job->exec() );
 
   Collection::List res;
   res = job->collections();
   compareLists( res, req );
 }
 
 void CollectionJobTest::testSelect()
 {
   CollectionPathResolver *resolver = new CollectionPathResolver( "res1/foo", this );;
   QVERIFY( resolver->exec() );
   Collection col( resolver->collection() );
 
   CollectionSelectJob *job = new CollectionSelectJob( col, this );
   QVERIFY( job->exec() );
   QCOMPARE( job->unseen(), -1 );
 
   job = new CollectionSelectJob( col, this );
   job->setRetrieveStatus( true );
   QVERIFY( job->exec() );
   QVERIFY( job->unseen() > -1 );
 
   job = new CollectionSelectJob( Collection::root(), this );
   QVERIFY( job->exec() );
 
   job = new CollectionSelectJob( Collection( INT_MAX ), this );
   QVERIFY( !job->exec() );
 }
 
 void CollectionJobTest::testRidFetch()
 {
   Collection col;
   col.setRemoteId( "10" );
 
   CollectionFetchJob *job = new CollectionFetchJob( col, CollectionFetchJob::Base, this );
   job->fetchScope().setResource( "akonadi_knut_resource_0" );
   QVERIFY( job->exec() );
   QCOMPARE( job->collections().count(), 1 );
   col = job->collections().first();
   QVERIFY( col.isValid() );
   QCOMPARE( col.remoteId(), QString::fromLatin1( "10" ) );
 }
 
 void CollectionJobTest::testRidCreateDelete()
 {
   Collection collection;
   collection.setName( "rid create" );
   collection.parentCollection().setRemoteId( "8" );
   collection.setRemoteId( "MY REMOTE ID" );
 
   ResourceSelectJob *resSel = new ResourceSelectJob( "akonadi_knut_resource_2" );
   AKVERIFYEXEC( resSel );
 
   CollectionCreateJob *createJob = new CollectionCreateJob( collection, this );
   AKVERIFYEXEC( createJob );
 
   Collection createdCol = createJob->collection();
   QVERIFY( createdCol.isValid() );
   QCOMPARE( createdCol.name(), collection.name() );
 
   CollectionFetchJob *listJob = new CollectionFetchJob( Collection( res3ColId ), CollectionFetchJob::FirstLevel, this );
   AKVERIFYEXEC( listJob );
   Collection listedCol = findCol( listJob->collections(), collection.name() );
   QCOMPARE( listedCol, createdCol );
   QCOMPARE( listedCol.name(), collection.name() );
 
   QVERIFY( !collection.isValid() );
   CollectionDeleteJob *delJob = new CollectionDeleteJob( collection, this );
   AKVERIFYEXEC( delJob );
 
   listJob = new CollectionFetchJob( Collection( res3ColId ), CollectionFetchJob::FirstLevel, this );
   AKVERIFYEXEC( listJob );
   QVERIFY( !findCol( listJob->collections(), collection.name() ).isValid() );
 }
 
 void CollectionJobTest::testAncestorRetrieval()
 {
   Collection col;
   col.setRemoteId( "10" );
 
   CollectionFetchJob *job = new CollectionFetchJob( col, CollectionFetchJob::Base, this );
   job->fetchScope().setResource( "akonadi_knut_resource_0" );
   job->fetchScope().setAncestorRetrieval( CollectionFetchScope::All );
   AKVERIFYEXEC( job );
   QCOMPARE( job->collections().count(), 1 );
   col = job->collections().first();
   QVERIFY( col.isValid() );
   QVERIFY( col.parentCollection().isValid() );
   QCOMPARE( col.parentCollection().remoteId(), QString( "6" ) );
   QCOMPARE( col.parentCollection().parentCollection(), Collection::root() );
+
+  ResourceSelectJob* select = new ResourceSelectJob( "akonadi_knut_resource_0", this );
+  AKVERIFYEXEC( select );
+  Collection col2( col );
+  col2.setId( -1 ); // make it invalid but keep the ancestor chain
+  job = new CollectionFetchJob( col2, CollectionFetchJob::Base, this );
+  AKVERIFYEXEC( job );
+  QCOMPARE( job->collections().count(), 1 );
+  col2 = job->collections().first();
+  QVERIFY( col2.isValid() );
+  QCOMPARE( col, col2 );
 }
 
 #include "collectionjobtest.moc"