diff --git a/mail/inc/class.mail_bo.inc.php b/mail/inc/class.mail_bo.inc.php
index fb3efadad2..8fbe34811e 100644
--- a/mail/inc/class.mail_bo.inc.php
+++ b/mail/inc/class.mail_bo.inc.php
@@ -1665,7 +1665,6 @@ class mail_bo
 		else
 		{
 			$_string = translation::decodeMailHeader($_string,self::$displayCharset);
-//$_tryIDNConversion=false;
 			if ($_tryIDNConversion===true && stripos($_string,'@')!==false)
 			{
 				$rfcAddr = imap_rfc822_parse_adrlist(str_replace(',','\,',$_string),'');
diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index b064d20774..c128b55b98 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -2176,7 +2176,11 @@ class mail_compose
 		$this->sessionData['attachments']  = $_formData['attachments'];
 		try
 		{
-			$identity = emailadmin_account::read_identity($this->sessionData['mailaccount'],true);
+			$acc = emailadmin_account::read($this->sessionData['mailaccount']);
+			//error_log(__METHOD__.__LINE__.array2string($acc));
+			$identity = emailadmin_account::read_identity($acc['ident_id'],true);
+
+			//$identity = emailadmin_account::read_identity($this->sessionData['mailaccount'],true);
 		}
 		catch (Exception $e)
 		{
@@ -2289,7 +2293,11 @@ class mail_compose
 		#error_log(print_r($this->preferences,true));
 		try
 		{
-			$identity = emailadmin_account::read_identity($this->sessionData['mailaccount'],true);
+			$acc = emailadmin_account::read($this->sessionData['mailaccount']);
+			//error_log(__METHOD__.__LINE__.array2string($acc));
+			$identity = emailadmin_account::read_identity($acc['ident_id'],true);
+
+			//$identity = emailadmin_account::read_identity($this->sessionData['mailaccount'],true);
 		}
 		catch (Exception $e)
 		{