diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 709fa69b2e3..c754dbe761a 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -1127,10 +1127,10 @@ if ($action == 'create') {	// aaa
 				$email = CMailFile::getValidAddress($object->email_from, 2);
 				if ($email && !isValidEmail($email)) {
 					$langs->load("errors");
-					print img_warning($langs->trans("ErrorBadEMail", $email));
+					print img_warning($langs->transnoentitiesnoconv("ErrorBadEMail", $email));
 				} elseif ($email && !isValidMailDomain($email)) {
 					$langs->load("errors");
-					print img_warning($langs->trans("ErrorBadMXDomain", $email));
+					print img_warning($langs->transnoentitiesnoconv("ErrorBadMXDomain", $email));
 				}
 			}
 			print '</td></tr>';
@@ -1141,16 +1141,17 @@ if ($action == 'create') {	// aaa
 				print $form->editfieldkey("MailErrorsTo", 'email_errorsto', $object->email_errorsto, $object, (int) ($user->hasRight('mailing', 'creer') && $object->status < $object::STATUS_SENTCOMPLETELY), 'string');
 				print '</td><td>';
 				print $form->editfieldval("MailErrorsTo", 'email_errorsto', $object->email_errorsto, $object, $user->hasRight('mailing', 'creer') && $object->status < $object::STATUS_SENTCOMPLETELY, 'string');
+
 				$emailarray = CMailFile::getArrayAddress($object->email_errorsto);
 				foreach ($emailarray as $email => $name) {
 					if ($name != $email) {
 						if ($action != 'editemail_errorsto') {
 							if ($email && !isValidEmail($email)) {
 								$langs->load("errors");
-								print img_warning($langs->trans("ErrorBadEMail", $email));
+								print img_warning($langs->transnoentitiesnoconv("ErrorBadEMail", $email));
 							} elseif ($email && !isValidMailDomain($email)) {
 								$langs->load("errors");
-								print img_warning($langs->trans("ErrorBadMXDomain", $email));
+								print img_warning($langs->transnoentitiesnoconv("ErrorBadMXDomain", $email));
 							}
 						}
 					} else {
@@ -1598,7 +1599,7 @@ if ($action == 'create') {	// aaa
 			$htmltext .= '</span></i>';
 
 			// Print mail content
-			print load_fiche_titre($langs->trans("EMail"), '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("AvailableVariables").'</span>', $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'generic');
+			print load_fiche_titre($langs->trans("EMail"), '<span class="opacitymedium small">'.$form->textwithpicto($langs->trans("AvailableVariables").'</span>', $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'generic');
 
 			print dol_get_fiche_head([], '', '', -1);
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index fb9959f5943..d967dd2140c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4358,7 +4358,7 @@ function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0, $mor
 /**
  * Show EMail link formatted for HTML output.
  *
- * @param	string		$email			EMail to show (only email, without 'Name of recipient' before)
+ * @param	string		$email			EMail to show (can be 'email' or 'Name of recipient <email>')
  * @param 	int			$contactid 		Id of contact if known
  * @param 	int			$socid 			Id of third party if known
  * @param 	int|string	$addlink		0=no link, 1=email has a html email link (+ link to create action if constant AGENDA_ADDACTIONFOREMAIL is on), 'thirdparty'=link to the thirdparty presend email
@@ -4401,9 +4401,15 @@ function dol_print_email($email, $contactid = 0, $socid = 0, $addlink = 0, $max
 			$newemail .= $email;
 		}
 		$newemail .= '</a>';
-		if ($showinvalid && !isValidEmail($email)) {
+
+		include_once DOL_DOCUMENT_ROOT.'/core/class/CMailfile.class.php';
+		$emailonly = CMailFile::getValidAddress($email, 2);
+		if ($showinvalid && !isValidEmail($emailonly)) {
 			$langs->load("errors");
-			$newemail .= img_warning($langs->trans("ErrorBadEMail", $email), '', 'paddingrightonly');
+			$newemail .= img_warning($langs->transnoentitiesnoconv("ErrorBadEMail", $emailonly), '', 'paddingrightonly');
+		} elseif ($showinvalid && !isValidMailDomain($emailonly)) {
+			$langs->load("errors");
+			$newemail .= img_warning($langs->transnoentitiesnoconv("ErrorBadMXDomain", $emailonly), '', 'paddingrightonly');
 		}
 
 		if (($contactid || $socid) && isModEnabled('agenda') && $user->hasRight("agenda", "myactions", "create")) {
@@ -4428,9 +4434,14 @@ function dol_print_email($email, $contactid = 0, $socid = 0, $addlink = 0, $max
 	} else {
 		$newemail = ($withpicto ? img_picto($langs->trans("EMail") . ' : ' . $email, (is_numeric($withpicto) ? 'email' : $withpicto), 'class="paddingrightonly"') : '') . $newemail;
 
-		if ($showinvalid && !isValidEmail($email)) {
+		include_once DOL_DOCUMENT_ROOT.'/core/class/CMailfile.class.php';
+		$emailonly = CMailFile::getValidAddress($email, 2);
+		if ($showinvalid && !isValidEmail($emailonly)) {
 			$langs->load("errors");
-			$newemail .= img_warning($langs->trans("ErrorBadEMail", $email));
+			$newemail .= img_warning($langs->transnoentitiesnoconv("ErrorBadEMail", $email));
+		} elseif ($showinvalid && !isValidMailDomain($emailonly)) {
+			$langs->load("errors");
+			$newemail .= img_warning($langs->transnoentitiesnoconv("ErrorBadMXDomain", $emailonly));
 		}
 	}