diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index 48e613591..21784d5b0 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -2769,8 +2769,8 @@ class Actions
 		$oDomain = $this->DomainProvider()->LoadOrCreateNewFromAction($this, 'domain-test-connection.de');
 		if ($oDomain)
 		{
-//			$oOpenSSL = \MailSo\Base\Utils::FunctionExistsAndEnabled('openssl_x509_parse');
-			$oOpenSSL = false; // TODO in dev
+//			$bOpenSSL = \MailSo\Base\Utils::FunctionExistsAndEnabled('openssl_x509_parse');
+			$bOpenSSL = false; // TODO in dev
 
 			try
 			{
@@ -2778,9 +2778,9 @@ class Actions
 				$oImapClient->SetTimeOuts(5);
 
 				$iTime = \microtime(true);
-				$oImapClient->Connect($oDomain->IncHost($oDomain->Name()), $oDomain->IncPort(), $oDomain->IncSecure(), $oOpenSSL);
+				$oImapClient->Connect($oDomain->IncHost($oDomain->Name()), $oDomain->IncPort(), $oDomain->IncSecure(), $bOpenSSL);
 
-				if ($oOpenSSL)
+				if ($bOpenSSL)
 				{
 					$aStreamContextParams = $oImapClient->StreamContextParams();
 					if (isset($aStreamContextParams['options']['ssl']['peer_certificate']))
@@ -2815,7 +2815,18 @@ class Actions
 				$oSmtpClient->SetTimeOuts(5);
 
 				$iTime = \microtime(true);
-				$oSmtpClient->Connect($oDomain->OutHost($oDomain->Name()), $oDomain->OutPort(), '127.0.0.1', $oDomain->OutSecure());
+				$oSmtpClient->Connect($oDomain->OutHost($oDomain->Name()), $oDomain->OutPort(), '127.0.0.1', $oDomain->OutSecure(), $bOpenSSL);
+
+				if ($bOpenSSL)
+				{
+					$aStreamContextParams = $oSmtpClient->StreamContextParams();
+					if (isset($aStreamContextParams['options']['ssl']['peer_certificate']))
+					{
+						$aParseData = @\openssl_x509_parse($aStreamContextParams['options']['ssl']['peer_certificate']);
+						$this->Logger()->WriteDump($aParseData);
+					}
+				}
+
 				$iSmtpTime = \microtime(true) - $iTime;
 				$oSmtpClient->Disconnect();
 				$bSmtpResult = true;
diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/rainloop/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
index 68b860817..c74f2fd20 100644
--- a/rainloop/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
+++ b/rainloop/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
@@ -123,7 +123,7 @@
 			   'btn-danger': testingDone() && (testingImapError() || testingSmtpError()) }">
 				<i data-bind="css: {'icon-info': !testing(), 'icon-spinner animated': testing(), 'icon-white': testingDone()}"></i>
 				&nbsp;&nbsp;
-				Test Connection
+				Test
 			</a>
 			<a class="btn button-white-list pull-left" data-bind="command: whiteListCommand">
 				<i data-bind="css: {'icon-right': !whiteListPage(), 'icon-left': whiteListPage()}"></i>