diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php b/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php
index 49d149d62..70fd3793c 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php
@@ -829,17 +829,19 @@ class Utils
 	 *
 	 * @param int &$iTimer
 	 * @param int $iTimeToReset = 15
-	 * @param int $iTimeToAdd = 30
+	 * @param int $iTimeToAdd = 120
 	 *
 	 * @return bool
 	 */
-	public static function ResetTimeLimit(&$iTimer, $iTimeToReset = 15, $iTimeToAdd = 30)
+	public static function ResetTimeLimit(&$iTimer, $iTimeToReset = 15, $iTimeToAdd = 120)
 	{
 		static $bValidateAction = null;
 		if (null === $bValidateAction)
 		{
-			$bValidateAction = !((bool) \ini_get('safe_mode')) &&
-				\MailSo\Base\Utils::FunctionExistsAndEnabled('set_time_limit');
+			$sSafeMode = \strtolower(\trim(@\ini_get('safe_mode')));
+			$bSafeMode = 'on' === $sSafeMode || '1' === $sSafeMode || 'true' === $sSafeMode;
+
+			$bValidateAction = !$bSafeMode && \MailSo\Base\Utils::FunctionExistsAndEnabled('set_time_limit');
 		}
 
 		if ($bValidateAction)
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
index 6c68573b2..1bd221972 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
@@ -26,7 +26,7 @@ class MailClient
 		$this->oLogger = null;
 
 		$this->oImapClient = \MailSo\Imap\ImapClient::NewInstance();
-		$this->oImapClient->SetTimeOuts(10, 30); // TODO
+		$this->oImapClient->SetTimeOuts(10, 300); // TODO
 	}
 
 	/**
@@ -1927,7 +1927,7 @@ class MailClient
 		{
 			// TODO
 			throw new \MailSo\Mail\Exceptions\RuntimeException(
-				'New folder name contain delimiter');
+				'New folder name contains delimiter');
 		}
 
 		$sFullNameRawToCreate = $sFolderParentFullNameRaw.$sFullNameRawToCreate;
@@ -2019,8 +2019,7 @@ class MailClient
             if (0 < \strlen($sDelimiter) && false !== \strpos($sNewFolderFullNameRaw, $sDelimiter))
             {
                 // TODO
-                throw new \MailSo\Mail\Exceptions\RuntimeException(
-                    'New folder name contain delimiter');
+                throw new \MailSo\Mail\Exceptions\RuntimeException('New folder name contains delimiter');
             }
 
             $sFolderParentFullNameRaw = false === $iLast ? '' : \substr($sPrevFolderFullNameRaw, 0, $iLast + 1);
diff --git a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Client.php b/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Client.php
index 2361de7fb..aa59f1bbd 100644
--- a/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Client.php
+++ b/rainloop/v/0.0.0/app/libraries/Sabre/DAV/Client.php
@@ -460,7 +460,10 @@ class Client {
     protected function curlRequest($url, $settings) {
 
         $curl = curl_init($url);
-		if (ini_get('open_basedir') === '' && ini_get('safe_mode' === 'Off'))
+		$sSafeMode = strtolower(trim(@ini_get('safe_mode')));
+		$bSafeMode = 'on' === $sSafeMode || '1' === $sSafeMode;
+
+		if (!$bSafeMode && ini_get('open_basedir') === '')
 		{
 			curl_setopt_array($curl, $settings);
 			$data = curl_exec($curl);