diff --git a/rainloop/v/0.0.0/app/domains/default.ini.dist b/rainloop/v/0.0.0/app/domains/default.ini.dist
index 77e579b82..d0e283504 100644
--- a/rainloop/v/0.0.0/app/domains/default.ini.dist
+++ b/rainloop/v/0.0.0/app/domains/default.ini.dist
@@ -1,9 +1,7 @@
 imap_host = "IMAP_HOST"
 imap_port = IMAP_PORT
 imap_secure = "SSL"
-imap_verify_ssl = Off
 smtp_host = "SMTP_HOST"
 smtp_port = SMTP_PORT
 smtp_secure = "SSL"
-smtp_verify_ssl = Off
 smtp_auth = On
diff --git a/rainloop/v/0.0.0/app/domains/disabled b/rainloop/v/0.0.0/app/domains/disabled
index e69de29bb..0370511f7 100644
--- a/rainloop/v/0.0.0/app/domains/disabled
+++ b/rainloop/v/0.0.0/app/domains/disabled
@@ -0,0 +1 @@
+outlook.com,qq.com,yahoo.com
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/app/domains/gmail.com.ini b/rainloop/v/0.0.0/app/domains/gmail.com.ini
index 56d9b5878..35ba11c25 100644
--- a/rainloop/v/0.0.0/app/domains/gmail.com.ini
+++ b/rainloop/v/0.0.0/app/domains/gmail.com.ini
@@ -1,9 +1,7 @@
 imap_host = "imap.gmail.com"
 imap_port = 993
 imap_secure = "SSL"
-imap_verify_ssl = Off
 smtp_host = "smtp.gmail.com"
 smtp_port = 465
 smtp_secure = "SSL"
-smtp_verify_ssl = Off
 smtp_auth = On
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/app/domains/outlook.com.ini b/rainloop/v/0.0.0/app/domains/outlook.com.ini
index b93a44700..ece6da4ba 100644
--- a/rainloop/v/0.0.0/app/domains/outlook.com.ini
+++ b/rainloop/v/0.0.0/app/domains/outlook.com.ini
@@ -1,9 +1,7 @@
 imap_host = "imap-mail.outlook.com"
 imap_port = 993
 imap_secure = "SSL"
-imap_verify_ssl = Off
 smtp_host = "smtp-mail.outlook.com"
 smtp_port = 587
 smtp_secure = "TLS"
-smtp_verify_ssl = Off
 smtp_auth = On
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/app/domains/qq.com.ini b/rainloop/v/0.0.0/app/domains/qq.com.ini
index 4a20052a8..c9be4e79c 100644
--- a/rainloop/v/0.0.0/app/domains/qq.com.ini
+++ b/rainloop/v/0.0.0/app/domains/qq.com.ini
@@ -1,9 +1,7 @@
 imap_host = "imap.qq.com"
 imap_port = 993
 imap_secure = "SSL"
-imap_verify_ssl = Off
 smtp_host = "smtp.qq.com"
 smtp_port = 465
 smtp_secure = "SSL"
-smtp_verify_ssl = Off
 smtp_auth = On
diff --git a/rainloop/v/0.0.0/app/domains/yahoo.com.ini b/rainloop/v/0.0.0/app/domains/yahoo.com.ini
index a28e985c7..02aa4eb7f 100644
--- a/rainloop/v/0.0.0/app/domains/yahoo.com.ini
+++ b/rainloop/v/0.0.0/app/domains/yahoo.com.ini
@@ -1,9 +1,7 @@
 imap_host = "imap.mail.yahoo.com"
 imap_port = 993
 imap_secure = "SSL"
-imap_verify_ssl = Off
 smtp_host = "smtp.mail.yahoo.com"
 smtp_port = 465
 smtp_secure = "SSL"
-smtp_verify_ssl = Off
 smtp_auth = On
\ No newline at end of file
diff --git a/rainloop/v/0.0.0/app/src/RainLoop/Actions.php b/rainloop/v/0.0.0/app/src/RainLoop/Actions.php
index fdf0dc35b..b7e009d58 100644
--- a/rainloop/v/0.0.0/app/src/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/src/RainLoop/Actions.php
@@ -3588,9 +3588,10 @@ class Actions
 
 	public function removeOldVersion()
 	{
+		$sVPath = APP_INDEX_ROOT_PATH.'rainloop/v/';
+
 		$this->Logger()->Write('Versions GC: Begin');
 
-		$sVPath = APP_INDEX_ROOT_PATH.'rainloop/v/';
 		$aDirs = @\array_map('basename', @\array_filter(@\glob($sVPath.'*'), 'is_dir'));
 
 		$this->Logger()->Write('Versions GC: Count:'.(\is_array($aDirs) ? \count($aDirs) : 0));
@@ -3604,9 +3605,18 @@ class Actions
 				if (APP_DEV_VERSION !== $sName && APP_VERSION !== $sName)
 				{
 					$this->Logger()->Write('Versions GC: Begin to remove  "'.$sVPath.$sName.'" version');
-					@\MailSo\Base\Utils::RecRmDir($sVPath.$sName);
-					$this->Logger()->Write('Versions GC: End to remove  "'.$sVPath.$sName.'" version');
 
+					if (@\unlink($sVPath.$sName.'/index.php'))
+					{
+						@\MailSo\Base\Utils::RecRmDir($sVPath.$sName);
+					}
+					else
+					{
+						$this->Logger()->Write('Versions GC (Error): index file cant be removed from"'.$sVPath.$sName.'"',
+							\MailSo\Log\Enumerations\Type::ERROR);
+					}
+
+					$this->Logger()->Write('Versions GC: End to remove  "'.$sVPath.$sName.'" version');
 					break;
 				}
 			}
diff --git a/rainloop/v/0.0.0/include.php b/rainloop/v/0.0.0/include.php
index 8e0ef8dfd..4d71e9f20 100644
--- a/rainloop/v/0.0.0/include.php
+++ b/rainloop/v/0.0.0/include.php
@@ -40,10 +40,12 @@ Options -Indexes
 			$sSite = strtolower(trim(empty($_SERVER['HTTP_HOST']) ? (empty($_SERVER['SERVER_NAME']) ? '' : $_SERVER['SERVER_NAME']) : $_SERVER['HTTP_HOST']));
 			$sSite = 'www.' === substr($sSite, 0, 4) ? substr($sSite, 4) : $sSite;
 			$sSite = preg_replace('/^.+@/', '', preg_replace('/:[\d]+$/', '', $sSite));
-			$sSite = in_array($sSite, array('localhost', '127.0.0.1', '::1', '::1/128', '0:0:0:0:0:0:0:1')) ? 'localhost' : $sSite;
+			$sSite = in_array($sSite, array('localhost', '127.0.0.1', '::1', '::1/128', '0:0:0:0:0:0:0:1')) ? 'localhost' : trim($sSite);
+			$sSite = 0 === strlen($sSite) ? 'localhost' : $sSite;
 
 			define('APP_SITE', $sSite);
-			define('APP_SITE_CLEAR', 0 < strlen(APP_SITE) ? trim(preg_replace('/[^a-zA-Z0-9_.\-]+/', '_', trim(strtolower(APP_SITE))), ' _') : '');
+
+			unset($sSite);
 
 			define('APP_DEFAULT_PRIVATE_DATA_NAME', '_default_');
 
@@ -177,7 +179,7 @@ Options -Indexes
 
 					if (@is_dir(APP_PRIVATE_DATA.'domains'))
 					{
-						$sFile = $sNewFile = '';
+						$sFile = $sNewFile = $sNewFileName = '';
 						$aFiles = @glob(APP_VERSION_ROOT_PATH.'app/domains/*');
 
 						if (is_array($aFiles) && 0 < \count($aFiles))
@@ -186,32 +188,45 @@ Options -Indexes
 							{
 								if (@is_file($sFile))
 								{
-									$sNewFile = APP_PRIVATE_DATA.'domains/'.basename($sFile);
-									if (!@file_exists($sNewFile))
+									$sNewFileName = basename($sFile);
+									if ('default.ini.dist' !== $sNewFileName)
 									{
-										@copy($sFile, $sNewFile);
+										$sNewFile = APP_PRIVATE_DATA.'domains/'.$sNewFileName;
+										if (!@file_exists($sNewFile))
+										{
+											@copy($sFile, $sNewFile);
+										}
 									}
 								}
 							}
 						}
 
-						unset($aFiles, $sFile, $sNewFile);
-						
-						if (@file_exists(APP_VERSION_ROOT_PATH.'app/domains/default.ini.dist'))
+						unset($aFiles, $sFile, $sNewFileName, $sNewFile);
+
+						if (@file_exists(APP_VERSION_ROOT_PATH.'app/domains/default.ini.dist') &&
+							!file_exists(APP_PRIVATE_DATA.'domains/'.APP_SITE.'.ini'))
 						{
+							$sClearedSiteName = preg_replace('/^(webmail|email|mail||imap|smtp)\./i', '', trim(APP_SITE));
+
 							$sConfigTemplate = @file_get_contents(APP_VERSION_ROOT_PATH.'app/domains/default.ini.dist');
-							$sConfigDomain = str_replace('IMAP_HOST','imap.'.$sSite,$sConfigTemplate);
-							$sConfigDomain = str_replace('IMAP_PORT','993',$sConfigDomain);
-							$sConfigDomain = str_replace('SMTP_HOST','smtp.'.$sSite,$sConfigDomain);
-							$sConfigDomain = str_replace('SMTP_PORT','465',$sConfigDomain);
-	
-							@file_put_contents(APP_PRIVATE_DATA.'domains/'.$sSite.'.ini', $sConfigDomain);
+
+							if (!empty($sConfigTemplate) && !empty($sClearedSiteName))
+							{
+								@file_put_contents(APP_PRIVATE_DATA.'domains/'.APP_SITE.'.ini', strtr($sConfigTemplate, array(
+									'IMAP_HOST' => 'localhost' !== $sClearedSiteName? 'imap.'.$sClearedSiteName : $sClearedSiteName,
+									'IMAP_PORT' => '993',
+									'SMTP_HOST' => 'localhost' !== $sClearedSiteName? 'smtp.'.$sClearedSiteName : $sClearedSiteName,
+									'SMTP_PORT' => '465'
+								)));
+							}
+
+							unset($sConfigTemplate, $sClearedSiteName);
 						}
 					}
 				}
 			}
 
-			unset($sSite, $sSalt, $sData, $sInstalled, $sConfigTemplate, $sConfigDomain, $sPrivateDataFolderInternalName);
+			unset($sSalt, $sData, $sInstalled, $sPrivateDataFolderInternalName);
 		}
 
 		include APP_VERSION_ROOT_PATH.'app/handle.php';