diff --git a/scripts/install b/scripts/install
index 73cbc7e..2b1e248 100644
--- a/scripts/install
+++ b/scripts/install
@@ -89,6 +89,6 @@ sudo chmod 644 $finalphpconf
 sudo yunohost app setting $app skipped_uris -v "/"
 
 # Reload Nginx and regenerate SSOwat conf
-sudo service php5-fpm restart
+sudo service php5-fpm reload
 sudo service nginx reload
 sudo yunohost app ssowatconf
diff --git a/scripts/remove b/scripts/remove
index 565bd5d..1870c46 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -10,6 +10,6 @@ sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf
 sudo rm -f /etc/php5/fpm/pool.d/$app.conf
 
 # Restart of services
-sudo service php5-fpm restart
+sudo service php5-fpm reload
 sudo service nginx reload
 sudo yunohost app ssowatconf
diff --git a/scripts/upgrade b/scripts/upgrade
index 8c2fe97..000757c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -90,8 +90,6 @@ sudo yunohost app setting $app skipped_uris -v "/"
 
 
 # Restart of services
-sudo service php5-fpm restart
+sudo service php5-fpm reload
 sudo service nginx reload
 sudo yunohost app ssowatconf
-
-
diff --git a/sources/backend/imap/imap.php b/sources/backend/imap/imap.php
index 3a04d2e..a3afb12 100644
--- a/sources/backend/imap/imap.php
+++ b/sources/backend/imap/imap.php
@@ -2075,6 +2075,13 @@ class BackendIMAP extends BackendDiff implements ISearchProvider {
 
         if (!isset($this->permanentStorage->fmFimapFid)) {
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendIMAP->getFolderIdFromImapId('%s') IMAP cache folder not found, creating one", $imapid));
+            // folderId to folderImap mapping
+            $this->permanentStorage->fmFidFimap = array();
+            // folderImap to folderId mapping
+            $this->permanentStorage->fmFimapFid = array();
+            // folderImap to folderId mapping - lowercase
+            $this->permanentStorage->fmFimapFidLowercase = array();
+
             $this->GetFolderList();
         }
 
@@ -2126,24 +2133,24 @@ class BackendIMAP extends BackendDiff implements ISearchProvider {
             // generate folderid and add it to the mapping
             $folderid = sprintf('%04x%04x', mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ));
 
-            // folderId to folderImap mapping
-            if (!isset($this->permanentStorage->fmFidFimap))
-                $this->permanentStorage->fmFidFimap = array();
+//             // folderId to folderImap mapping
+//             if (!isset($this->permanentStorage->fmFidFimap))
+//                 $this->permanentStorage->fmFidFimap = array();
 
             $a = $this->permanentStorage->fmFidFimap;
             $a[$folderid] = $imapid;
             $this->permanentStorage->fmFidFimap = $a;
 
-            // folderImap to folderid mapping
-            if (!isset($this->permanentStorage->fmFimapFid))
-                $this->permanentStorage->fmFimapFid = array();
+//             // folderImap to folderid mapping
+//             if (!isset($this->permanentStorage->fmFimapFid))
+//                 $this->permanentStorage->fmFimapFid = array();
 
             $b = $this->permanentStorage->fmFimapFid;
             $b[$imapid] = $folderid;
             $this->permanentStorage->fmFimapFid = $b;
 
-            if (!isset($this->permanentStorage->fmFimapFidLowercase))
-                $this->permanentStorage->fmFimapFidLowercase = array();
+//             if (!isset($this->permanentStorage->fmFimapFidLowercase))
+//                 $this->permanentStorage->fmFimapFidLowercase = array();
 
             $c = $this->permanentStorage->fmFimapFidLowercase;
             $c[strtolower($imapid)] = $folderid;