diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php b/framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php
index 4aef8bd8a7d..e943c482493 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php
@@ -189,8 +189,10 @@ protected function _handle()
 
             $this->_encoder->endTag();
         } elseif ($update) {
-            $collections->updateFolderInHierarchy($folder, true);
-            $collections->save();
+            if ($status == self::STATUS_SUCCESS) {
+                $collections->updateFolderInHierarchy($folder, true);
+                $collections->save();
+            }
 
             $this->_encoder->startTag(self::FOLDERUPDATE);
 
@@ -204,7 +206,9 @@ protected function _handle()
 
             $this->_encoder->endTag();
         } elseif ($delete) {
-            $collections->deleteFolderFromHierarchy($server_uid);
+            if ($status == self::STATUS_SUCCESS) {
+                $collections->deleteFolderFromHierarchy($server_uid);
+            }
             $this->_encoder->startTag(self::FOLDERDELETE);
 
             $this->_encoder->startTag(Horde_ActiveSync::FOLDERHIERARCHY_STATUS);