diff --git a/plugins/backup/index.php b/plugins/backup/index.php
index f581a580a..af9be843b 100644
--- a/plugins/backup/index.php
+++ b/plugins/backup/index.php
@@ -33,7 +33,7 @@ class BackupPlugin extends \RainLoop\Plugins\AbstractPlugin
 		$sZipHash = \MailSo\Base\Utils::Sha1Rand();
 		$sZipFileName = APP_PRIVATE_DATA . $sZipHash . '.zip';
 
-		\touch(APP_PRIVATE_DATA.'cache/CACHEDIR.TAG');
+		\file_put_contents(APP_PRIVATE_DATA.'cache/CACHEDIR.TAG', 'Signature: 8a477f597d28d172789f06886806bc55');
 
 		if (\class_exists('ZipArchive')) {
 //			$oZip = new \ZipArchive();
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/File.php b/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/File.php
index 0fc9ab15e..aa7de2783 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/File.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/File.php
@@ -25,6 +25,11 @@ class File implements \MailSo\Cache\DriverInterface
 	function __construct(string $sCacheFolder, string $sKeyPrefix = '')
 	{
 		$this->sCacheFolder = \rtrim(\trim($sCacheFolder), '\\/').'/';
+
+		// http://www.brynosaurus.com/cachedir/
+		$tag = $this->sCacheFolder . 'CACHEDIR.TAG';
+		\is_file($tag) || \file_put_contents($tag, 'Signature: 8a477f597d28d172789f06886806bc55');
+
 		if (!empty($sKeyPrefix)) {
 			$sKeyPrefix = \str_pad(\preg_replace('/[^a-zA-Z0-9_]/', '_',
 				\rtrim(\trim($sKeyPrefix), '\\/')), 5, '_');
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php b/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
index cdaf91811..99be6d0ef 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
@@ -172,7 +172,10 @@ abstract class Upgrade
 //		$tar_destination = APP_DATA_FOLDER_PATH . APP_VERSION . '.tar';
 		$tar_destination = APP_DATA_FOLDER_PATH . 'backup-' . \date('YmdHis') . '.tar';
 		$tar = new \PharData($tar_destination);
-		$files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(APP_DATA_FOLDER_PATH . '_data_'), \RecursiveIteratorIterator::SELF_FIRST);
+		$files = new \RecursiveIteratorIterator(
+			new \RecursiveDirectoryIterator(APP_DATA_FOLDER_PATH . '_data_'),
+			\RecursiveIteratorIterator::SELF_FIRST
+		);
 		$l = \strlen(APP_DATA_FOLDER_PATH);
 		foreach ($files as $file) {
 			$file = \str_replace('\\', '/', $file);