diff --git a/akonadi/collectioncreatejob.cpp b/akonadi/collectioncreatejob.cpp
index 9f94c9087..2baf48efc 100644
--- a/akonadi/collectioncreatejob.cpp
+++ b/akonadi/collectioncreatejob.cpp
@@ -1,113 +1,113 @@
 /*
     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 "collectioncreatejob.h"
 #include "imapparser_p.h"
 #include "protocolhelper_p.h"
 
 #include "job_p.h"
 
 #include <kdebug.h>
 
 using namespace Akonadi;
 
 class Akonadi::CollectionCreateJobPrivate : public JobPrivate
 {
   public:
     CollectionCreateJobPrivate( CollectionCreateJob *parent )
       : JobPrivate( parent )
     {
     }
 
     Collection mCollection;
 };
 
 CollectionCreateJob::CollectionCreateJob( const Collection &collection, QObject * parent )
   : Job( new CollectionCreateJobPrivate( this ), parent )
 {
   Q_D( CollectionCreateJob );
 
   d->mCollection = collection;
 }
 
 CollectionCreateJob::~CollectionCreateJob( )
 {
 }
 
 void CollectionCreateJob::doStart( )
 {
   Q_D( CollectionCreateJob );
-  if ( d->mCollection.parent() < 0 && d->mCollection.parentRemoteId().isEmpty() ) {
+  if ( d->mCollection.parentCollection().id() < 0 && d->mCollection.parentCollection().remoteId().isEmpty() ) {
     setError( Unknown );
     setErrorText( QLatin1String("Invalid parent") );
     emitResult();
     return;
   }
 
   QByteArray command = d->newTag();
-  if ( d->mCollection.parent() < 0 )
+  if ( d->mCollection.parentCollection().id() < 0 )
     command += " RID";
   command += " CREATE \"" + d->mCollection.name().toUtf8() + "\" ";
-  if ( d->mCollection.parent() >= 0 )
-    command += QByteArray::number( d->mCollection.parent() );
+  if ( d->mCollection.parentCollection().id() >= 0 )
+    command += QByteArray::number( d->mCollection.parentCollection().id() );
   else
-    command += ImapParser::quote( d->mCollection.parentRemoteId().toUtf8() );
+    command += ImapParser::quote( d->mCollection.parentCollection().remoteId().toUtf8() );
   command += " (";
   if ( !d->mCollection.contentMimeTypes().isEmpty() )
   {
     QList<QByteArray> cList;
     foreach( const QString &s, d->mCollection.contentMimeTypes() ) cList << s.toLatin1();
     command += "MIMETYPE (" + ImapParser::join( cList, QByteArray(" ") ) + ')';
   }
   command += " REMOTEID \"" + d->mCollection.remoteId().toUtf8() + '"';
   foreach ( Attribute* attr, d->mCollection.attributes() )
     command += ' ' + attr->type() + ' ' + ImapParser::quote( attr->serialized() );
   command += ' ' + ProtocolHelper::cachePolicyToByteArray( d->mCollection.cachePolicy() );
   command += ")\n";
   d->writeData( command );
   emitWriteFinished();
 }
 
 Collection CollectionCreateJob::collection() const
 {
   Q_D( const CollectionCreateJob );
 
   return d->mCollection;
 }
 
 void CollectionCreateJob::doHandleResponse(const QByteArray & tag, const QByteArray & data)
 {
   Q_D( CollectionCreateJob );
 
   if ( tag == "*" ) {
     Collection col;
     ProtocolHelper::parseCollection( data, col );
     if ( !col.isValid() )
       return;
 
-    col.setParent( d->mCollection.parent() );
+    col.setParentCollection( d->mCollection.parentCollection() );
     col.setName( d->mCollection.name() );
     col.setRemoteId( d->mCollection.remoteId() );
     d->mCollection = col;
   } else {
     Job::doHandleResponse( tag, data );
   }
 }
 
 #include "collectioncreatejob.moc"