diff --git a/inc/lib_filestorage.php b/inc/lib_filestorage.php
index 06ce26f0d2..45becf7c8f 100644
--- a/inc/lib_filestorage.php
+++ b/inc/lib_filestorage.php
@@ -359,7 +359,9 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
 	public function toTmpFile($path){
 		$tmpFolder=sys_get_temp_dir();
 		$filename=tempnam($tmpFolder,'OC_TEMP_FILE_'.substr($path,strrpos($path,'.')));
+		$fileStats = stat($this->datadir.$path);
 		if(copy($this->datadir.$path,$filename)){
+			touch($filename, $fileStats['mtime'], $fileStats['atime']);
 			$this->notifyObservers($path,OC_FILEACTION_READ);
 			return $filename;
 		}else{
@@ -368,7 +370,9 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
 	}
 
 	public function fromTmpFile($tmpFile,$path){
+		$fileStats = stat($tmpFile);
 		if(rename($tmpFile,$this->datadir.$path)){
+			touch($this->datadir.$path, $fileStats['mtime'], $fileStats['atime']);
 			$this->notifyObservers($path,OC_FILEACTION_CREATE);
 			return true;
 		}else{