diff --git a/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMailboxMapper.java b/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMailboxMapper.java
index b6881d3..47825c0 100644
--- a/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMailboxMapper.java
+++ b/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMailboxMapper.java
@@ -255,10 +255,11 @@ public class JCRMailboxMapper extends AbstractJCRMapper implements MailboxMapper
                         for (int i = 0; i < nameParts.length; i++) {
                            String part = nameParts[i];
                            if (i == 1) {
-                               node = JcrUtils.getOrAddNode(node, String.valueOf(part.charAt(0)), "jamesMailbox:mailbox");   
+                               node = JcrUtils.getOrAddNode(node, String.valueOf(part.charAt(0)), "nt:unstructured");   
 
                            } 
-                           node = JcrUtils.getOrAddNode(node, part, "jamesMailbox:mailbox");   
+                           node = JcrUtils.getOrAddNode(node, part, "nt:unstructured");
+                           node.addMixin("jamesMailbox:mailbox");
                            
                         }
                         jcrMailbox.merge(node);
diff --git a/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMessageMapper.java b/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMessageMapper.java
index c15f756..3522d90 100644
--- a/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMessageMapper.java
+++ b/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMessageMapper.java
@@ -450,7 +450,8 @@ public class JCRMessageMapper extends AbstractJCRMapper implements MessageMapper
                 locker.execute(new NodeLockedExecution<Void>() {
 
                     public Void execute(Node node) throws RepositoryException {
-                        Node messageNode = node.addNode(String.valueOf(membership.getUid()),"jamesMailbox:message");
+                        Node messageNode = node.addNode(String.valueOf(membership.getUid()),"nt:file");
+                        messageNode.addMixin("jamesMailbox:message");
                         try {
                             membership.merge(messageNode);
                         } catch (IOException e) {
diff --git a/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java b/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java
index 7128b90..6bf8395 100644
--- a/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java
+++ b/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java
@@ -362,7 +362,8 @@ public class JCRMessage extends AbstractDocument implements MailboxMembership<St
         // add headers to the message again
         for (int i = 0; i < newHeaders.size(); i++) {
             JCRHeader header = (JCRHeader) newHeaders.get(i);
-            Node headerNode = node.addNode("messageHeader", HEADER_NODE_TYPE);
+            Node headerNode = node.addNode("messageHeader", "nt:unstructured");
+            headerNode.addMixin(HEADER_NODE_TYPE);
             header.merge(headerNode);
         }
       
@@ -381,7 +382,8 @@ public class JCRMessage extends AbstractDocument implements MailboxMembership<St
         // store new properties
         for (int i = 0; i < newProperites.size(); i++) {
             JCRProperty prop = (JCRProperty)newProperites.get(i);
-            Node propNode = node.addNode("messageProperty", PROPERTY_NODE_TYPE);
+            Node propNode = node.addNode("messageProperty", "nt:unstructured");
+            propNode.addMixin(PROPERTY_NODE_TYPE);
             prop.merge(propNode);
         }
       
diff --git a/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java b/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java
index cc607e6..de74dd7 100644
--- a/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java
+++ b/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java
@@ -159,7 +159,8 @@ public class JCRSubscriptionMapper extends AbstractJCRMapper implements Subscrip
                 // This is needed to minimize the child nodes a bit
                 Node userNode = JcrUtils.getOrAddNode(subscriptionsNode, String.valueOf(username.charAt(0)));
                 userNode = JcrUtils.getOrAddNode(userNode, String.valueOf(username));
-                node = JcrUtils.getOrAddNode(userNode, mailbox, "jamesMailbox:subscription");
+                node = JcrUtils.getOrAddNode(userNode, mailbox, "nt:unstructured");
+                node.addMixin("jamesMailbox:subscription");
             } else {
                 node = sub.getNode();
             }
diff --git a/jcr/src/main/resources/org/apache/james/imap/jcr/imap.cnd b/jcr/src/main/resources/org/apache/james/imap/jcr/imap.cnd
index b1ab9cd..27ed130 100644
--- a/jcr/src/main/resources/org/apache/james/imap/jcr/imap.cnd
+++ b/jcr/src/main/resources/org/apache/james/imap/jcr/imap.cnd
@@ -17,22 +17,26 @@
 
 <jamesMailbox = 'http://james.apache.org/imap/jcr/'>
 
-[jamesMailbox:subscription] > nt:base
+[jamesMailbox:subscription] > mix:created
+    mixin
     - jamesMailbox:subscriptionUsername (STRING) mandatory
     - jamesMailbox:subscriptionMailbox (STRING) mandatory
 
-[jamesMailbox:messageHeader] > nt:base
+[jamesMailbox:messageHeader] > mix:created
+    mixin
     - jamesMailbox:headerFieldName (STRING) mandatory
     - jamesMailbox:headerValue(STRING) mandatory
     - jamesMailbox:headerLineNumber (LONG) mandatory
 
-[jamesMailbox:messageProperty] > nt:base
+[jamesMailbox:messageProperty] > mix:created
+    mixin
     - jamesMailbox:propertyNamespace (STRING) mandatory
     - jamesMailbox:propertyLocalName (STRING) mandatory
     - jamesMailbox:propertyValue(STRING) mandatory
     - jamesMailbox:propertyOrder (Long) mandatory
    
-[jamesMailbox:message] >  mix:referenceable, nt:file
+[jamesMailbox:message] >  mix:referenceable, mix:created, mix:created
+    mixin
     - jamesMailbox:mailboxUUID (String) mandatory
     - jamesMailbox:uid (LONG) mandatory
     - jamesMailbox:size (LONG) mandatory
@@ -46,11 +50,12 @@
     - jamesMailbox:messageBodyStartOctet (LONG) mandatory
     - jamesMailbox:messageTextualLineCount (LONG)
     - jamesMailbox:messageSubType (String) mandatory
-    + messageHeader (jamesMailbox:messageHeader)  multiple
-    + messageProperty (jamesMailbox:messageProperty) multiple
+    + messageHeader (nt:unstructured)  multiple
+    + messageProperty (nt:unstructured) multiple
 
-[jamesMailbox:mailbox] >  mix:referenceable, mix:lockable, nt:folder
+[jamesMailbox:mailbox] >  mix:referenceable, mix:lockable, mix:created
+    mixin
     - jamesMailbox:mailboxUidValidity (LONG) 
     - jamesMailbox:mailboxName (STRING) 
     - jamesMailbox:mailboxLastUid (LONG) 
-    + * (nt:folder) multiple
+    + * (nt:unstructured) multiple