diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 47dfb568c78..d575c8089f0 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1295,18 +1295,10 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 					setEventMessage($mesg, 'errors');
 				}
 			}
-			/*            }
-			 else
-			{
-			$langs->load("other");
-			$mesg='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').' !</div>';
-			$action='presend';
-			dol_syslog('Recipient email is empty');
-			}*/
 		} else {
-			$langs->load("errors");
-			setEventMessage($langs->trans('ErrorCantReadFile', $file), 'errors');
-			dol_syslog('Failed to read file: ' . $file);
+			$langs->load("other");
+			setEventMessage($langs->trans('ErrorMailRecipientIsEmpty') . '!', 'errors');
+			dol_syslog($langs->trans('ErrorMailRecipientIsEmpty'));
 		}
 	} else {
 		$langs->load("other");
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 58001d5c918..8e618663237 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1615,8 +1615,9 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				$sendtoid = $_POST['receiver'];
 			}
 		}
-
-		if (dol_strlen($sendto)) {
+		
+		if (dol_strlen($sendto)) 
+		{
 			$langs->load("commercial");
 
 			$from = $_POST['fromname'] . ' <' . $_POST['frommail'] . '>';
@@ -1715,17 +1716,10 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					setEventMessage($mesg, 'errors');
 				}
 			}
-			/*            }
-			 else
-			{
-			$langs->load("other");
-			$mesgs[]='<div class="error">'.$langs->trans('ErrorMailRecipientIsEmpty').'</div>';
-			dol_syslog('Recipient email is empty');
-			}*/
 		} else {
-			$langs->load("errors");
-			setEventMessage($langs->trans('ErrorCantReadFile', $file), 'errors');
-			dol_syslog('Failed to read file: ' . $file);
+			$langs->load("other");
+			setEventMessage($langs->trans('ErrorMailRecipientIsEmpty') . '!', 'errors');
+			dol_syslog($langs->trans('ErrorMailRecipientIsEmpty'));
 		}
 	} else {
 		$langs->load("other");
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 23092acfd0d..a94a77f1454 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2862,7 +2862,11 @@ function price($amount, $form=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou
 
 		$listofcurrenciesbefore=array('USD');
 		if (in_array($currency_code,$listofcurrenciesbefore)) $cursymbolbefore.=$outlangs->getCurrencySymbol($currency_code);
-		else $cursymbolafter.=$outlangs->getCurrencySymbol($currency_code);
+		else 
+		{
+			$tmpcur=$outlangs->getCurrencySymbol($currency_code);
+			$cursymbolafter.=($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);
+		}
 	}
 	$output=$cursymbolbefore.$output.$end.$cursymbolafter;