diff --git a/src/server/storage/akonadidb.xml b/src/server/storage/akonadidb.xml
index e8350c1b0..c5791d05e 100644
--- a/src/server/storage/akonadidb.xml
+++ b/src/server/storage/akonadidb.xml
@@ -1,248 +1,248 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Copyright (c) 2006 Volker Krause <vkrause@kde.org>
     Copyright (C) 2006 by Tobias Koenig <tokoe@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.
 
 -->
 
 
 <!--
   Akonadi Database Schema Definition
 
   This file is used to generate database access code as well as the tables itself.
 
   Database element (root node, can contain table and relation elements)
 
   Table attributes (can contain column, reference and data elements)
   - name: The entity class name, the table will be named FooTable.
 
   Column attributes:
   - name: The column name, will be also used as accessor name in the entity class.
   - type: The C++ type of this column, the SQL type will be derived from that.
   - size: The size of the SQL column (optional, semantic depends on "type")
   - default: Default value for entity class constructor.
   - refTable, refColumn: foreign key, also used to generate accessor methods for 1:n relations
   - methodName: method name to access referred records, the table name is used if not given
   - onUpdate, onDelete: referential actions for foreign keys
 
   Indices:
   - name: The name of the index
   - columns: The columns covered by this index
   - unique: bool, indicates if this index must contain unique data
 
   Reference attributes (indication n:1 relations)
   - name: Used for naming the method during code generation
   - table: name of the table a n:1 relation exist
   - key: column name of the referenced table containing the foreign key
 
   Initial data:
   - columns: A comma separated list of column names
   - values: A comma separated and SQL-quoted list of values
 
   Relation elements define a n:m relation between two tables.
   Attributes:
   - table[12]: Table names
   - column[12]: Column names
 
 -->
 <database>
 
   <table name="SchemaVersion">
     <comment>Contains the schema version of the database.</comment>
     <column name="version" type="int" default="0" allowNull="false"/>
     <column name="generation" type="int" default="0" allowNull="false" />
-    <data columns="version" values="35"/>
+    <data columns="version" values="36"/>
   </table>
 
   <table name="Resource">
     <column name="id" type="qint64" allowNull="false" isAutoIncrement="true" isPrimaryKey="true"/>
     <column name="name" type="QString" allowNull="false" isUnique="true"/>
     <column name="isVirtual" type="bool" default="false"/>
     <reference name="collections" table="Collection" key="resourceId"/>
     <data columns="name,isVirtual" values="'akonadi_search_resource',true"/>
   </table>
 
   <table name="Collection">
     <enum name="Tristate">
       <value name="False"/>
       <value name="True"/>
       <value name="Undefined"/>
     </enum>
 
     <column name="id" type="qint64" allowNull="false" isAutoIncrement="true" isPrimaryKey="true"/>
     <column name="remoteId" type="QString"/>
     <column name="remoteRevision" type="QString"/>
     <column name="name" type="QString" allowNull="false"/>
     <column name="parentId" type="qint64" refTable="Collection" refColumn="id" methodName="parent"/>
     <column name="resourceId" type="qint64" refTable="Resource" refColumn="id" allowNull="false"/>
     <column name="enabled" type="bool" default="true" allowNull="false"/>
     <column name="syncPref" type="enum" enumType="Tristate" default="Tristate::Undefined"/>
     <column name="displayPref" type="enum" enumType="Tristate" default="Tristate::Undefined"/>
     <column name="indexPref" type="enum" enumType="Tristate" default="Tristate::Undefined"/>
     <column name="referenced" type="bool" default="false" allowNull="false"/>
     <column name="cachePolicyInherit" type="bool" default="true" allowNull="false"/>
     <column name="cachePolicyCheckInterval" type="int" default="-1" allowNull="false"/>
     <column name="cachePolicyCacheTimeout" type="int" default="-1" allowNull="false"/>
     <column name="cachePolicySyncOnDemand" type="bool" default="false" allowNull="false"/>
     <column name="cachePolicyLocalParts" type="QString"/>
     <column name="queryString" type="QString" size="32768"/>
     <column name="queryAttributes" type="QString"/>
     <column name="queryCollections" type="QString"/>
     <column name="isVirtual" type="bool" default="false"/>
     <index name="parentAndNameIndex" columns="parentId,name" unique="true"/>
     <index name="enabledIndex" columns="enabled" unique="false"/>
     <index name="syncPrefIndex" columns="syncPref" unique="false"/>
     <index name="displayPrefIndex" columns="displayPref" unique="false"/>
     <index name="indexPrefIndex" columns="indexPref" unique="false"/>
     <reference name="children" table="Collection" key="parentId"/>
     <reference name="items" table="PimItem" key="collectionId"/>
     <reference name="attributes" table="CollectionAttribute" key="collectionId"/>
     <data columns="parentId,name,resourceId,isVirtual" values="NULL,'Search',1,true"/>
   </table>
 
   <table name="MimeType">
     <comment>This meta data is stored inside akonadi to provide fast access.</comment>
     <column name="id" type="qint64" allowNull="false" isAutoIncrement="true" isPrimaryKey="true"/>
     <column name="name" type="QString" allowNull="false" isUnique="true"/>
   </table>
 
   <table name="PimItem">
     <column name="id" type="qint64" allowNull="false" isAutoIncrement="true" isPrimaryKey="true"/>
     <column name="rev" type="int" default="0" allowNull="false"/>
     <column name="remoteId" type="QString"/>
     <column name="remoteRevision" type="QString"/>
     <column name="gid" type="QString"/>
     <column name="collectionId" type="qint64" refTable="Collection" refColumn="id"/>
     <column name="mimeTypeId" type="qint64" refTable="MimeType" refColumn="id" onDelete="Restrict"/>
     <column name="datetime" type="QDateTime" default="QDateTime::currentDateTimeUtc()">
       <comment>create/modified time</comment>
     </column>
     <column name="atime" type="QDateTime" default="QDateTime::currentDateTimeUtc()">
       <comment>read access time</comment>
     </column>
     <column name="dirty" type="bool">
       <comment>Indicates that this item has unsaved changes.</comment>
     </column>
     <column name="size" type="qint64" default="0" allowNull="false"/>
     <index name="collectionIndex" columns="collectionId" unique="false"/>
     <index name="gidIndex" columns="gid" unique="false"/>
     <index name="ridIndex" columns="remoteId" unique="false"/>
     <index name="idSortIndex" columns="id" unique="false" sort="DESC"/>
     <reference name="parts" table="Part" key="pimItemId"/>
   </table>
 
   <table name="Flag">
     <comment>This meta data is stored inside akonadi to provide fast access.</comment>
     <column name="id" type="qint64" allowNull="false" isAutoIncrement="true" isPrimaryKey="true"/>
     <column name="name" type="QString" allowNull="false" isUnique="true"/>
   </table>
 
  <table name="PartType">
    <comment>Table containing item part types.</comment>
    <column name="id" type="qint64" allowNull="false" isAutoIncrement="true" isPrimaryKey="true"/>
    <column name="name" type="QString" allowNull="false">
      <comment>Part name, without namespace.</comment>
    </column>
    <column name="ns" type="QString" allowNull="false">
      <comment>Part namespace.</comment>
    </column>
    <index name="partTypeNameIndex" columns="ns,name" unique="true"/>
  </table>
 
   <table name="Part">
     <enum name="Storage">
       <value name="Internal"/>
       <value name="External"/>
       <value name="Foreign"/>
     </enum>
     <column name="id" type="qint64" allowNull="false" isAutoIncrement="true" isPrimaryKey="true"/>
     <column name="pimItemId" type="qint64" refTable="PimItem" refColumn="id" allowNull="false"/>
     <column name="partTypeId" type="qint64" refTable="PartType" refColumn="id" allowNull="false" noUpdate="true" />
     <column name="data" type="QByteArray"/>
     <column name="datasize" type="qint64" allowNull="false"/>
     <column name="version" type="int" default="0"/>
     <column name="storage" type="enum" enumType="Storage" default="Internal"/>
     <index name="pimItemIdTypeIndex" columns="pimItemId,partTypeId" unique="true"/>
     <index name="pimItemIdSortIndex" columns="pimItemId" unique="false" sort="DESC"/>
   </table>
 
   <table name="CollectionAttribute">
     <column name="id" type="qint64" allowNull="false" isAutoIncrement="true" isPrimaryKey="true"/>
     <column name="collectionId" type="qint64" refTable="Collection" refColumn="id" allowNull="false"/>
     <column name="type" type="QByteArray" allowNull="false"/>
     <column name="value" type="QByteArray"/>
     <index name="collectionIndex" columns="collectionId" unique="false"/>
   </table>
 
   <table name="TagType">
     <column name="id" type="qint64" allowNull="false" isAutoIncrement="true" isPrimaryKey="true"/>
     <column name="name" type="QString" allowNull="false" isUnique="true"/>
     <data columns="name" values="'PLAIN'"/>
   </table>
 
   <table name="Tag">
     <column name="id" type="qint64" allowNull="false" isAutoIncrement="true" isPrimaryKey="true"/>
     <column name="gid" type="QString" allowNull="false"/>
-    <column name="parentId" type="qint64" refTable="Tag" refColumn="id" allowNull="true" methodName="parent"/>
+    <column name="parentId" type="qint64" refTable="Tag" refColumn="id" allowNull="true" methodName="parent" default="-1"/>
     <column name="typeId" type="qint64" refTable="TagType" refColumn="id" onDelete="Restrict" default="1"/>
   </table>
 
   <table name="TagAttribute">
     <column name="id" type="qint64" allowNull="false" isAutoIncrement="true" isPrimaryKey="true"/>
     <column name="tagId" type="qint64" allowNull="false" refTable="Tag" refColumn="id"/>
     <column name="type" type="QByteArray" allowNull="false"/>
     <column name="value" type="QByteArray"/>
     <index name="tagIndex" columns="tagId" unique="false"/>
   </table>
 
   <table name="TagRemoteIdResourceRelation" identificationColumn="">
     <column name="tagId" type="qint64" allowNull="false" refTable="Tag" refColumn="id" onDelete="Cascade" />
     <column name="resourceId"  type="qint64" allowNull="false" refTable="Resource" refColumn="id" onDelete="Cascade" />
     <column name="remoteId" type="QString" allowNull="false" />
     <index name="TagAndResourceIndex" columns="tagId,resourceId" unique="true"/>
   </table>
 
   <table name="RelationType">
     <column name="id" type="qint64" allowNull="false" isAutoIncrement="true" isPrimaryKey="true"/>
     <column name="name" type="QString" allowNull="false" isUnique="true"/>
     <data columns="name" values="'GENERIC'"/>
   </table>
 
   <table name="Relation" identificationColumn="">
     <column name="leftId" type="qint64" allowNull="false" refTable="PimItem" refColumn="id" onDelete="Cascade" methodName="left" />
     <column name="rightId"  type="qint64" allowNull="false" refTable="PimItem" refColumn="id" onDelete="Cascade" methodName="right" />
     <column name="typeId" type="qint64" refTable="RelationType" refColumn="id" onDelete="Restrict" default="1"/>
     <column name="remoteId" type="QString" />
     <index name="RelationIndex" columns="leftId,rightId,typeId" unique="true"/>
   </table>
 
   <relation table1="PimItem" column1="id" table2="Flag" column2="id">
     <index name="pimItemIdSortIndex" columns="pimitem_id" unique="false" sort="DESC"/>
   </relation>
 
   <relation table1="PimItem" column1="id" table2="Tag" column2="id"/>
 
   <relation table1="Collection" column1="id" table2="MimeType" column2="id">
     <comment>Specifies allowed MimeType for a Collection</comment>
   </relation>
 
   <relation table1="Collection" column1="id" table2="PimItem" column2="id">
     <comment>Used to associate items with search folders.</comment>
   </relation>
 </database>
diff --git a/src/server/storage/entities.xsl b/src/server/storage/entities.xsl
index d56e93ced..803a46cc6 100644
--- a/src/server/storage/entities.xsl
+++ b/src/server/storage/entities.xsl
@@ -1,272 +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.
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 <xsl:output method="text" encoding="utf-8"/>
 
 <xsl:include href="entities-header.xsl"/>
 <xsl:include href="entities-source.xsl"/>
 
 <!-- select wether to generate header or implementation code. -->
 <xsl:param name="code">header</xsl:param>
 
 <xsl:template match="/">
 /*
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
 <!-- header generation -->
 <xsl:if test="$code='header'">
 #ifndef AKONADI_ENTITIES_H
 #define AKONADI_ENTITIES_H
 #include "storage/entity.h"
 
 #include &lt;private/tristate_p.h&gt;
 
 #include &lt;QtCore/QDebug&gt;
 #include &lt;QtCore/QSharedDataPointer&gt;
 #include &lt;QtCore/QString&gt;
 #include &lt;QtCore/QVariant&gt;
 
 template &lt;typename T&gt; class QVector;
 class QSqlQuery;
 class QStringList;
 
 namespace Akonadi {
 namespace Server {
 
 // forward declaration for table classes
 <xsl:for-each select="database/table">
 class <xsl:value-of select="@name"/>;
 </xsl:for-each>
 
 // forward declaration for relation classes
 <xsl:for-each select="database/relation">
 class <xsl:value-of select="@table1"/><xsl:value-of select="@table2"/>Relation;
 </xsl:for-each>
 
 <xsl:for-each select="database/table">
 <xsl:call-template name="table-header"/>
 </xsl:for-each>
 
 <xsl:for-each select="database/relation">
 <xsl:call-template name="relation-header"/>
 </xsl:for-each>
 
 /** Returns a list of all table names. */
 QVector&lt;QString&gt; allDatabaseTables();
 
 } // namespace Server
 } // namespace Akonadi
 
 <xsl:for-each select="database/table">
 <xsl:call-template name="table-debug-header"/>
 </xsl:for-each>
 
 <xsl:for-each select="database/table">
 Q_DECLARE_TYPEINFO( Akonadi::Server::<xsl:value-of select="@name"/>, Q_MOVABLE_TYPE );
 </xsl:for-each>
 #endif
 
 </xsl:if>
 
 <!-- cpp generation -->
 <xsl:if test="$code='source'">
 #include &lt;entities.h&gt;
 #include &lt;storage/datastore.h&gt;
 #include &lt;storage/selectquerybuilder.h&gt;
 #include &lt;utils.h&gt;
 #include &lt;akonadiserver_debug.h&gt;
 
 #include &lt;qsqldatabase.h&gt;
 #include &lt;qsqlquery.h&gt;
 #include &lt;qsqlerror.h&gt;
 #include &lt;qsqldriver.h&gt;
 #include &lt;qvariant.h&gt;
 #include &lt;QtCore/QHash&gt;
 #include &lt;QtCore/QMutex&gt;
 #include &lt;QtCore/QThread&gt;
 
 using namespace Akonadi;
 using namespace Akonadi::Server;
 
 static QStringList removeEntry(QStringList list, const QString&amp; entry)
 {
   list.removeOne(entry);
   return list;
 }
 
 <xsl:for-each select="database/table">
 <xsl:call-template name="table-source"/>
 </xsl:for-each>
 
 <xsl:for-each select="database/relation">
 <xsl:call-template name="relation-source"/>
 </xsl:for-each>
 
 QVector&lt;QString&gt; Akonadi::Server::allDatabaseTables()
 {
   static const QVector&lt;QString&gt; allTables = QVector&lt;QString&gt;()
   <xsl:for-each select="database/table">
     &lt;&lt; QStringLiteral( "<xsl:value-of select="@name"/>Table" )
   </xsl:for-each>
   <xsl:for-each select="database/relation">
     &lt;&lt; QStringLiteral( "<xsl:value-of select="@table1"/><xsl:value-of select="@table2"/>Relation" )
   </xsl:for-each>
   ;
   return allTables;
 }
 
 </xsl:if>
 
 </xsl:template>
 
 
 <!-- Helper templates -->
 
 <!-- uppercase first letter -->
 <xsl:template name="uppercase-first">
 <xsl:param name="argument"/>
 <xsl:value-of select="concat(translate(substring($argument,1,1),'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'), substring($argument,2))"/>
 </xsl:template>
 
 <xsl:template name="data-type">
   <xsl:choose>
     <xsl:when test="@type = 'enum'"><xsl:value-of select="../@name"/>::<xsl:value-of select="@enumType"/></xsl:when>
     <xsl:otherwise><xsl:value-of select="@type"/></xsl:otherwise>
   </xsl:choose>
 </xsl:template>
 
 <!-- generates function argument code for the current column -->
 <xsl:template name="argument">
   <xsl:if test="starts-with(@type,'Q')">const </xsl:if><xsl:call-template name="data-type"/><xsl:text> </xsl:text>
   <xsl:if test="starts-with(@type,'Q')">&amp;</xsl:if><xsl:value-of select="@name"/>
 </xsl:template>
 
 <!-- signature of setter method -->
 <xsl:template name="setter-signature">
 <xsl:variable name="methodName">
   <xsl:value-of select="concat(translate(substring(@name,1,1),'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'), substring(@name,2))"/>
 </xsl:variable>
 set<xsl:value-of select="$methodName"/>( <xsl:call-template name="argument"/> )
 </xsl:template>
 
 <!-- field name list -->
 <xsl:template name="column-list">
   <xsl:for-each select="column">
     <xsl:value-of select="@name"/>
     <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
   </xsl:for-each>
 </xsl:template>
 
 <!-- data retrieval for a given key field -->
 <xsl:template name="data-retrieval">
 <xsl:param name="key"/>
 <xsl:param name="key2"/>
 <xsl:param name="lookupKey" select="$key"/>
 <xsl:param name="cache"/>
 <xsl:variable name="className"><xsl:value-of select="@name"/></xsl:variable>
   <xsl:if test="$cache != ''">
   if ( Private::cacheEnabled ) {
     QMutexLocker lock(&amp;Private::cacheMutex);
     QHash&lt;<xsl:value-of select="column[@name = $key]/@type"/>, <xsl:value-of select="$className"/>&gt;::const_iterator it = Private::<xsl:value-of select="$cache"/>.constFind(<xsl:value-of select="$lookupKey"/>);
     if ( it != Private::<xsl:value-of select="$cache"/>.constEnd() ) {
       return it.value();
     }
   }
   </xsl:if>
   QSqlDatabase db = DataStore::self()->database();
   if ( !db.isOpen() )
     return <xsl:value-of select="$className"/>();
 
   QueryBuilder qb( tableName(), QueryBuilder::Select );
   static const QStringList columns = removeEntry(columnNames(), <xsl:value-of select="$key"/>Column());
   qb.addColumns( columns );
   qb.addValueCondition( <xsl:value-of select="$key"/>Column(), Query::Equals, <xsl:value-of select="$key"/> );
   <xsl:if test="$key2 != ''">
   qb.addValueCondition( <xsl:value-of select="$key2"/>Column(), Query::Equals, <xsl:value-of select="$key2"/> );
   </xsl:if>
   if ( !qb.exec() ) {
     qCWarning(AKONADISERVER_LOG) &lt;&lt; "Error during selection of record with <xsl:value-of select="$key"/>"
       &lt;&lt; <xsl:value-of select="$key"/> &lt;&lt; "from table" &lt;&lt; tableName()
       &lt;&lt; qb.query().lastError().text();
     return <xsl:value-of select="$className"/>();
   }
   if ( !qb.query().next() ) {
     return <xsl:value-of select="$className"/>();
   }
 
   <!-- this indirection is required to prevent off-by-one access now that we skip the key column -->
   int valueIndex = 0;
   <xsl:for-each select="column">
     const <xsl:call-template name="data-type"/> value<xsl:value-of select="position()"/> =
     <xsl:choose>
       <xsl:when test="@name=$key">
         <xsl:value-of select="$key"/>;
       </xsl:when>
       <xsl:otherwise>
         (qb.query().isNull(valueIndex)) ?
-        <xsl:call-template name="data-type"/>() :
+        <xsl:call-template name="data-type"/>(<xsl:value-of select="@default"/>) :
         <xsl:choose>
           <xsl:when test="starts-with(@type,'QString')">
           Utils::variantToString( qb.query().value( valueIndex ) )
           </xsl:when>
           <xsl:when test="starts-with(@type, 'enum')">
           static_cast&lt;<xsl:value-of select="@enumType"/>&gt;(qb.query().value( valueIndex ).value&lt;int&gt;())
           </xsl:when>
           <xsl:when test="starts-with(@type, 'QDateTime')">
           Utils::variantToDateTime(qb.query().value(valueIndex))
           </xsl:when>
           <xsl:otherwise>
           qb.query().value( valueIndex ).value&lt;<xsl:value-of select="@type"/>&gt;()
           </xsl:otherwise>
         </xsl:choose>
         ; ++valueIndex;
       </xsl:otherwise>
     </xsl:choose>
   </xsl:for-each>
 
   <xsl:value-of select="$className"/> rv(
   <xsl:for-each select="column">
     value<xsl:value-of select="position()"/>
     <xsl:if test="position() != last()">,</xsl:if>
   </xsl:for-each>
   );
   if ( Private::cacheEnabled ) {
     Private::addToCache( rv );
   }
   return rv;
 </xsl:template>
 
 <!-- method name for n:1 referred records -->
 <xsl:template name="method-name-n1">
 <xsl:choose>
 <xsl:when test="@methodName != ''">
   <xsl:value-of select="@methodName"/>
 </xsl:when>
 <xsl:otherwise>
   <xsl:value-of select="concat(translate(substring(@refTable,1,1),'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'), substring(@refTable,2))"/>
 </xsl:otherwise>
 </xsl:choose>
 </xsl:template>
 
 </xsl:stylesheet>