diff --git a/build/nextcloud.php b/build/nextcloud.php
index b36a8fbee..9970cd0f5 100755
--- a/build/nextcloud.php
+++ b/build/nextcloud.php
@@ -29,15 +29,11 @@ $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator('snappymai
 foreach ($files as $file) {
 	if (is_file($file)) {
 		$newFile = str_replace('\\', '/', $file);
-//		$newFile = str_replace("'snappymail/v/'.", '', $newFile);
-		$nc_tar->addFile($file, "snappymail/app/{$newFile}");
+		$newName = str_replace('/.htaccess', '/_htaccess', $newFile);
+		$nc_tar->addFile($file, "snappymail/app/{$newName}");
 		$hashes["app/{$newFile}"] = hash_file('sha512', $file);
 	}
 }
-$nc_tar->delete("snappymail/app/snappymail/v/{$package->version}/app/.htaccess");
-$nc_tar->addFile("snappymail/v/{$package->version}/app/.htaccess", "snappymail/app/snappymail/v/{$package->version}/app/_htaccess");
-$nc_tar->delete("snappymail/app/snappymail/v/{$package->version}/static/.htaccess");
-$nc_tar->addFile("snappymail/v/{$package->version}/static/.htaccess", "snappymail/app/snappymail/v/{$package->version}/static/_htaccess");
 
 /*
 $nc_tar->addFile('data/.htaccess');
diff --git a/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php b/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
index 6eb7fd3d1..9ce6ca532 100644
--- a/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
+++ b/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
@@ -35,9 +35,9 @@ class InstallStep implements IRepairStep
 		if (!\file_exists(APP_VERSION_ROOT_PATH . 'app/.htaccess') && \file_exists(APP_VERSION_ROOT_PATH . 'app/_htaccess')) {
 			\rename(APP_VERSION_ROOT_PATH . 'app/_htaccess', APP_VERSION_ROOT_PATH . 'app/.htaccess');
 		}
-		if (!\file_exists(APP_VERSION_ROOT_PATH . 'static/.htaccess') && \file_exists(APP_VERSION_ROOT_PATH . 'static/_htaccess')) {
-			\rename(APP_VERSION_ROOT_PATH . 'static/_htaccess', APP_VERSION_ROOT_PATH . 'static/.htaccess');
-		}
+//		if (!\file_exists(APP_VERSION_ROOT_PATH . 'static/.htaccess') && \file_exists(APP_VERSION_ROOT_PATH . 'static/_htaccess')) {
+//			\rename(APP_VERSION_ROOT_PATH . 'static/_htaccess', APP_VERSION_ROOT_PATH . 'static/.htaccess');
+//		}
 
 		$oConfig = \RainLoop\Api::Config();
 		$bSave = false;