diff --git a/lib/ext/Syncroton/Command/FolderCreate.php b/lib/ext/Syncroton/Command/FolderCreate.php
index 222c556..5e966b8 100644
--- a/lib/ext/Syncroton/Command/FolderCreate.php
+++ b/lib/ext/Syncroton/Command/FolderCreate.php
@@ -1,140 +1,155 @@
 <?php
 /**
  * Syncroton
  *
  * @package     Syncroton
  * @subpackage  Command
  * @license     http://www.tine20.org/licenses/lgpl.html LGPL Version 3
  * @copyright   Copyright (c) 2008-2012 Metaways Infosystems GmbH (http://www.metaways.de)
  * @author      Lars Kneschke <l.kneschke@metaways.de>
  */
 
 /**
  * class to handle ActiveSync FolderCreate command
  *
  * @package     Syncroton
  * @subpackage  Command
  */
 class Syncroton_Command_FolderCreate extends Syncroton_Command_Wbxml
 {
     protected $_defaultNameSpace    = 'uri:FolderHierarchy';
     protected $_documentElement     = 'FolderCreate';
     
     /**
      * @var Syncroton_Model_Folder
      */
     protected $_folder;
 
     /**
      * @var int
      */
     protected $_status;
     
     /**
      * parse FolderCreate request
      */
     public function handle()
     {
         $xml = simplexml_import_dom($this->_requestBody);
         
         $syncKey = (int)$xml->SyncKey;
 
         if ($this->_logger instanceof Zend_Log) 
             $this->_logger->debug(__METHOD__ . '::' . __LINE__ . " synckey is $syncKey");
         
         if (!($this->_syncState = $this->_syncStateBackend->validate($this->_device, 'FolderSync', $syncKey)) instanceof Syncroton_Model_SyncState) {
             if ($this->_logger instanceof Zend_Log) 
                 $this->_logger->info(__METHOD__ . '::' . __LINE__ . " invalid synckey provided. FolderSync 0 needed.");
 
             $this->_status = Syncroton_Command_FolderSync::STATUS_INVALID_SYNC_KEY;
             return;
         }
         
         $folder = new Syncroton_Model_Folder($xml);
         
         if ($this->_logger instanceof Zend_Log)
             $this->_logger->debug(__METHOD__ . '::' . __LINE__ . " parentId: {$folder->parentId} displayName: {$folder->displayName}");
 
         if (!strlen($folder->displayName)) {
             $this->_status = Syncroton_Command_FolderSync::STATUS_MISFORMATTED;
             return;
         }
         
         switch($folder->type) {
             case Syncroton_Command_FolderSync::FOLDERTYPE_CALENDAR_USER_CREATED:
                 $folder->class = Syncroton_Data_Factory::CLASS_CALENDAR;
                 break;
                 
             case Syncroton_Command_FolderSync::FOLDERTYPE_CONTACT_USER_CREATED:
                 $folder->class = Syncroton_Data_Factory::CLASS_CONTACTS;
                 break;
                 
             case Syncroton_Command_FolderSync::FOLDERTYPE_MAIL_USER_CREATED:
                 $folder->class = Syncroton_Data_Factory::CLASS_EMAIL;
                 break;
 
             case Syncroton_Command_FolderSync::FOLDERTYPE_NOTE_USER_CREATED:
                 $folder->class = Syncroton_Data_Factory::CLASS_NOTES;
                 break;
                 
             case Syncroton_Command_FolderSync::FOLDERTYPE_TASK_USER_CREATED:
                 $folder->class = Syncroton_Data_Factory::CLASS_TASKS;
                 break;
                 
             default:
                 // unsupported type
                 return;
         }
 
         try {
             $dataController = Syncroton_Data_Factory::factory($folder->class, $this->_device, $this->_syncTimeStamp);
 
             $this->_folder = $dataController->createFolder($folder);
 
             if (!$this->_folder) {
                 $this->_status = Syncroton_Command_FolderSync::STATUS_UNKNOWN_ERROR;
             } else {
                 $this->_folder->class        = $folder->class;
                 $this->_folder->deviceId     = $this->_device;
                 $this->_folder->creationTime = $this->_syncTimeStamp;
 
-                $this->_folderBackend->create($this->_folder);
+                // Check if the folder already exists to avoid a duplicate insert attempt in db
+                try {
+                    $this->_folderBackend->getFolder($this->_device, $this->_folder->serverId);
+
+                    if ($this->_logger instanceof Zend_Log)
+                        $this->_logger->info(__METHOD__ . '::' . __LINE__ . " Attempted to create a folder that already exists. parentId: {$folder->parentId} displayName: {$folder->displayName}");
+
+                    // The folder already exists
+                    $this->_status = Syncroton_Command_FolderSync::STATUS_FOLDER_EXISTS;
+                } catch (Syncroton_Exception_NotFound $e) {
+                    // This is the normal case
+                    if ($this->_logger instanceof Zend_Log)
+                        $this->_logger->debug(__METHOD__ . '::' . __LINE__ . " " . $e->getMessage());
+
+                    $this->_folderBackend->create($this->_folder);
+                }
             }
         } catch (Syncroton_Exception_Status $e) {
             if ($this->_logger instanceof Zend_Log)
-                $this->_logger->debug(__METHOD__ . '::' . __LINE__ . " " . $e->getMessage());
+                $this->_logger->warn(__METHOD__ . '::' . __LINE__ . " " . $e->getMessage());
 
             $this->_status = $e->getCode();
         } catch (Exception $e) {
             if ($this->_logger instanceof Zend_Log)
-                $this->_logger->debug(__METHOD__ . '::' . __LINE__ . " " . $e->getMessage());
+                $this->_logger->warn(__METHOD__ . '::' . __LINE__ . " " . $e->getMessage());
 
             $this->_status = Syncroton_Command_FolderSync::STATUS_UNKNOWN_ERROR;
         }
     }
     
     /**
      * generate FolderCreate response
      */
     public function getResponse()
     {
         $folderCreate = $this->_outputDom->documentElement;
         
         if ($this->_status) {
             $folderCreate->appendChild($this->_outputDom->createElementNS('uri:FolderHierarchy', 'Status', $this->_status));
         } else {
             $this->_syncState->counter++;
             $this->_syncState->lastsync = $this->_syncTimeStamp;
             
             // store folder in state backend
             $this->_syncStateBackend->update($this->_syncState);
             
             // create xml output
             $folderCreate->appendChild($this->_outputDom->createElementNS('uri:FolderHierarchy', 'Status',   Syncroton_Command_FolderSync::STATUS_SUCCESS));
             $folderCreate->appendChild($this->_outputDom->createElementNS('uri:FolderHierarchy', 'SyncKey',  $this->_syncState->counter));
             $folderCreate->appendChild($this->_outputDom->createElementNS('uri:FolderHierarchy', 'ServerId', $this->_folder->serverId));
         }
         
         return $this->_outputDom;
     }
 }