diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index 3402946a13..6ace8d1448 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -148,6 +148,9 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 		}
 		\OC\Files\Filesystem::unlink($this->path);
 
+		// remove properties
+		$this->removeProperties();
+
 	}
 
 	/**
diff --git a/lib/private/connector/sabre/node.php b/lib/private/connector/sabre/node.php
index c38e9f8637..3c2ad60f1d 100644
--- a/lib/private/connector/sabre/node.php
+++ b/lib/private/connector/sabre/node.php
@@ -190,6 +190,17 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 		return true;
 	}
 
+	/**
+	 * removes all properties for this node and user
+	 */
+	public function removeProperties() {
+		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*properties`'
+		.' WHERE `userid` = ? AND `propertypath` = ?' );
+		$query->execute( array( OC_User::getUser(), $this->path));
+
+		$this->setPropertyCache(null);
+	}
+
 	/**
 	 * @brief Returns a list of properties for this nodes.;
 	 * @param array $properties
diff --git a/lib/private/connector/sabre/objecttree.php b/lib/private/connector/sabre/objecttree.php
index df8902f66e..cd3f081f7c 100644
--- a/lib/private/connector/sabre/objecttree.php
+++ b/lib/private/connector/sabre/objecttree.php
@@ -97,6 +97,11 @@ class ObjectTree extends \Sabre_DAV_ObjectTree {
 			throw new \Sabre_DAV_Exception_Forbidden('');
 		}
 
+		// update properties
+		$query = \OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertypath` = ?'
+		.' WHERE `userid` = ? AND `propertypath` = ?' );
+		$query->execute( array( $destinationPath, \OC_User::getUser(), $sourcePath ));
+
 		$this->markDirty($sourceDir);
 		$this->markDirty($destinationDir);