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 182540b6d..ebf4aedce 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
@@ -139,6 +139,7 @@ class ImapClient extends \MailSo\Net\NetClient
 		$type = $this->IsSupported('LOGINDISABLED') ? '' : 'LOGIN'; // RFC3501 6.2.3
 		$types = [
 			// if !$encrypted:
+//			'SCRAM-SHA-512' => 1,
 //			'SCRAM-SHA-256' => 1,
 //			'SCRAM-SHA-1' => 1,
 			// if $encrypted:
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/ManageSieveClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/ManageSieveClient.php
index 24c30a28a..ee5431baf 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/ManageSieveClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/ManageSieveClient.php
@@ -111,8 +111,11 @@ class ManageSieveClient extends \MailSo\Net\NetClient
 //			$encrypted = !empty(\stream_get_meta_data($this->ConnectionResource())['crypto']);
 			$type = '';
 			$types = [
+				// if !$encrypted:
+//				'SCRAM-SHA-512' => 1, // !$encrypted
 //				'SCRAM-SHA-256' => 1, // !$encrypted
 //				'SCRAM-SHA-1' => 1, // !$encrypted
+				// if $encrypted:
 //				'CRAM-MD5' => 1, // $encrypted
 				'OAUTHBEARER' => $aCredentials['UseAuthOAuth2IfSupported'],
 				'XOAUTH2' => $aCredentials['UseAuthOAuth2IfSupported'],
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
index cc1804c61..9577ba5c7 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
@@ -126,6 +126,7 @@ class SmtpClient extends \MailSo\Net\NetClient
 		$type = '';
 		$types = [
 			// if !$encrypted:
+			'SCRAM-SHA-512' => 1,
 			'SCRAM-SHA-256' => 1,
 			'SCRAM-SHA-1' => 1,
 			// if $encrypted:
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php
index f4ea724d4..a74c4ecc8 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php
@@ -21,6 +21,7 @@ class Scram extends \SnappyMail\SASL
 	function __construct(string $algo)
 	{
 		if (\stripos($algo, '-PLUS')) {
+			// https://github.com/the-djmaze/snappymail/issues/182
 			throw new \Exception("SASL SCRAM channel binding unsupported: {$algo}");
 		}
 		$algo = \str_replace('sha-', 'sha', \strtolower($algo));