diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/InvalidResponseException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/InvalidResponseException.php
index fa9c82247..1a8b64086 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/InvalidResponseException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/InvalidResponseException.php
@@ -16,4 +16,4 @@ namespace MailSo\Imap\Exceptions;
  * @package Imap
  * @subpackage Exceptions
  */
-class InvalidResponseException extends \MailSo\Imap\Exceptions\ResponseException {}
+class InvalidResponseException extends ResponseException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/LoginBadCredentialsException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/LoginBadCredentialsException.php
index eb440089d..a8680c7ec 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/LoginBadCredentialsException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/LoginBadCredentialsException.php
@@ -16,4 +16,4 @@ namespace MailSo\Imap\Exceptions;
  * @package Imap
  * @subpackage Exceptions
  */
-class LoginBadCredentialsException extends \MailSo\Imap\Exceptions\LoginException {}
\ No newline at end of file
+class LoginBadCredentialsException extends LoginException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/LoginBadMethodException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/LoginBadMethodException.php
index 358f06dc5..25b89768f 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/LoginBadMethodException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/LoginBadMethodException.php
@@ -16,4 +16,4 @@ namespace MailSo\Imap\Exceptions;
  * @package Imap
  * @subpackage Exceptions
  */
-class LoginBadMethodException extends \MailSo\Imap\Exceptions\LoginException {}
\ No newline at end of file
+class LoginBadMethodException extends LoginException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/LoginException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/LoginException.php
index 4e5172a29..3c138d51a 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/LoginException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/LoginException.php
@@ -16,4 +16,4 @@ namespace MailSo\Imap\Exceptions;
  * @package Imap
  * @subpackage Exceptions
  */
-class LoginException extends \MailSo\Imap\Exceptions\NegativeResponseException {}
+class LoginException extends NegativeResponseException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/NegativeResponseException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/NegativeResponseException.php
index 43a277ece..14d8791b7 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/NegativeResponseException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/NegativeResponseException.php
@@ -16,7 +16,7 @@ namespace MailSo\Imap\Exceptions;
  * @package Imap
  * @subpackage Exceptions
  */
-class NegativeResponseException extends \MailSo\Imap\Exceptions\ResponseException
+class NegativeResponseException extends ResponseException
 {
 
 	public function getAlertFromStatus() : string
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/ResponseException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/ResponseException.php
index a6bb233f7..1eac5eaee 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/ResponseException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/ResponseException.php
@@ -25,9 +25,11 @@ class ResponseException extends \MailSo\Imap\Exceptions\Exception
 
 	public function __construct(?\MailSo\Imap\ResponseCollection $oResponses = null, string $sMessage = '', int $iCode = 0, ?\Throwable $oPrevious = null)
 	{
-		parent::__construct($sMessage, $iCode, $oPrevious);
-
 		$this->oResponses = $oResponses;
+		if (!$sMessage && $response = $this->GetLastResponse()) {
+			$sMessage = $response->OptionalResponse[0] . ' ' . $response->HumanReadable;
+		}
+		parent::__construct($sMessage, $iCode, $oPrevious);
 	}
 
 	public function GetResponses() : ?\MailSo\Imap\ResponseCollection