diff --git a/.htaccess b/.htaccess
index faa8201c8..c44f1a2a6 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,7 +1,16 @@
+#<FilesMatch "index\.php">
+#	allow from all
+#	AcceptPathInfo On
+#</FilesMatch>
+
 <IfModule mod_rewrite.c>
 	RewriteEngine On
 	# Redirect cPanel
 	RewriteRule cpsess.* https://%{HTTP_HOST}/ [L,R=301]
+
+#	RewriteCond %{REQUEST_FILENAME} !-f
+#	RewriteCond %{REQUEST_FILENAME} !-d
+#	RewriteRule ^(.+)$ index.php/$1 [L,QSA]
 </IfModule>
 
 <IfModule mod_expires.c>
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
index e46e2541c..ab26fbf57 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -66,6 +66,12 @@ abstract class Service
 		}
 
 		$sQuery = \trim($_SERVER['QUERY_STRING'] ?? '');
+/*
+		if (!empty($_SERVER['PATH_INFO'])) {
+			$sQuery = "{$_SERVER['PATH_INFO']}&{$sQuery}";
+			$_SERVER['REQUEST_URI'] = \substr($_SERVER['REQUEST_URI'],0, -\strlen($_SERVER['REQUEST_URI']));
+		}
+*/
 		$iPos = \strpos($sQuery, '&');
 		if (0 < $iPos) {
 			$sQuery = \substr($sQuery, 0, $iPos);