diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
index a6326a358..2d254fe0c 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
@@ -219,14 +219,15 @@ class ImapClient extends \MailSo\Net\NetClient
 			}
 			else
 			{
+				$sPassword = $this->EscapeString(\utf8_decode($sPassword));
 				if ($this->oLogger)
 				{
-					$this->oLogger->AddSecret($this->EscapeString($sPassword));
+					$this->oLogger->AddSecret($sPassword);
 				}
 				$oResponse = $this->SendRequestGetResponse('LOGIN',
 					array(
 						$this->EscapeString($sLogin),
-						$this->EscapeString($sPassword)
+						$sPassword
 					));
 			}