diff --git a/conf/nginx.conf b/conf/nginx.conf
index 6eff8db..c3be9a9 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -4,18 +4,18 @@ location /Microsoft-Server-ActiveSync {
             rewrite ^ https://$server_name$request_uri? permanent;
        }
        index index.php;
-       try_files $uri $uri/ /index.php?$args;
+       try_files $uri $uri/ index.php;
+       rewrite ^(.*)$  /Microsoft-Server-ActiveSync/index.php last;
        location ~ [^/]\.php(/|$) {
-           fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-           fastcgi_pass unix:/var/run/php5-fpm.sock;
-           fastcgi_index index.php;
-           include fastcgi_params;
-           fastcgi_param AUTH_USER $remote_user;
-           fastcgi_param PATH_INFO $fastcgi_path_info;
+              fastcgi_split_path_info ^(.+?\.php)(/.*)$;
+              fastcgi_pass unix:/var/run/php5-fpm.sock;
+              fastcgi_index index.php;
+              include fastcgi_params;
+              fastcgi_param HTTPS on;
+              fastcgi_read_timeout 630;
        }
 
-
-  # Include SSOWAT user panel.
-  include conf.d/yunohost_panel.conf.inc;
+# Include SSOWAT user panel.
+include conf.d/yunohost_panel.conf.inc;
 }