diff --git a/.htaccess b/.htaccess
index c60638476..40514ae50 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,24 +1,7 @@
 <IfModule mod_rewrite.c>
 	RewriteEngine On
-
 	# Redirect cPanel
 	RewriteRule cpsess.* https://%{HTTP_HOST}/ [L,R=301]
-
-	RewriteCond %{HTTP:Accept-encoding} br
-	RewriteCond "%{REQUEST_FILENAME}\.br" -s
-	RewriteRule "^(.+\.js)$" "$1\.br" [L,T=text/javascript,QSA]
-
-	RewriteCond %{HTTP:Accept-encoding} gzip
-	RewriteCond "%{REQUEST_FILENAME}\.gz" -s
-	RewriteRule "^(.+\.js)$" "$1\.gz" [L,T=text/javascript,QSA]
-
-	RewriteCond %{HTTP:Accept-encoding} br
-	RewriteCond "%{REQUEST_FILENAME}\.br" -s
-	RewriteRule "^(.+\.css)$" "$1\.br" [L,T=text/css,QSA]
-
-	RewriteCond %{HTTP:Accept-encoding} gzip
-	RewriteCond "%{REQUEST_FILENAME}\.gz" -s
-	RewriteRule "^(.+\.css)$" "$1\.gz" [L,T=text/css,QSA]
 </IfModule>
 
 <IfModule mod_expires.c>
diff --git a/assets/.htaccess b/assets/.htaccess
new file mode 100644
index 000000000..4d77a2ed0
--- /dev/null
+++ b/assets/.htaccess
@@ -0,0 +1,17 @@
+<IfModule mod_rewrite.c>
+	RewriteCond %{HTTP:Accept-encoding} br
+	RewriteCond "%{REQUEST_FILENAME}\.br" -s
+	RewriteRule "^(.+\.js)$" "$1\.br" [L,T=application/javascript,QSA]
+
+	RewriteCond %{HTTP:Accept-encoding} gzip
+	RewriteCond "%{REQUEST_FILENAME}\.gz" -s
+	RewriteRule "^(.+\.js)$" "$1\.gz" [L,T=application/javascript,QSA]
+
+	RewriteCond %{HTTP:Accept-encoding} br
+	RewriteCond "%{REQUEST_FILENAME}\.br" -s
+	RewriteRule "^(.+\.css)$" "$1\.br" [L,T=text/css,QSA]
+
+	RewriteCond %{HTTP:Accept-encoding} gzip
+	RewriteCond "%{REQUEST_FILENAME}\.gz" -s
+	RewriteRule "^(.+\.css)$" "$1\.gz" [L,T=text/css,QSA]
+</IfModule>
diff --git a/tasks/config.js b/tasks/config.js
index 8ee95f407..f66ab106a 100644
--- a/tasks/config.js
+++ b/tasks/config.js
@@ -21,7 +21,7 @@ config.paths.staticMinJS = 'snappymail/v/' + config.devVersion + '/static/js/min
 config.paths.staticCSS = 'snappymail/v/' + config.devVersion + '/static/css/';
 
 config.paths.assets = {
-	src: 'assets/**/*.*'
+	src: ['assets/**/*.*', 'assets/**/.htaccess']
 };
 
 config.paths.less = {