diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 65b24e41c9d..8c78948a63c 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -340,6 +340,8 @@ if ($_POST["action"] == 'confirm_canceled' && $_POST["confirm"] == yes)
  */
 if ($_POST["action"] == 'send' || $_POST["action"] == 'relance')
 {
+  $langs->load("mails");
+    
   $fac = new Facture($db,"",$_POST["facid"]);
   if ( $fac->fetch($_POST["facid"]) )
     {
@@ -392,7 +394,7 @@ if ($_POST["action"] == 'send' || $_POST["action"] == 'relance')
 
 	      if ( $mailfile->sendfile() )
 		{		  
-          $msg='<div class="ok">Mails envoyé avec succès à '.htmlentities($sendto).' (de la part de '.htmlentities($from).')</div>';
+          $msg='<div class="ok">'.$langs->trans("MailSuccessfulySent",$sendto,$from).'.</div>';
 
 		  $sendto = htmlentities($sendto);
 			  
@@ -410,12 +412,12 @@ if ($_POST["action"] == 'send' || $_POST["action"] == 'relance')
 		}
 	      else
 		{
-		  $msg='<div class="error">'.$langs->trans("ErrorFailedToSendMail",htmlentities($from),htmlentities($sendto)).'</div>';
+		  $msg='<div class="error">'.$langs->trans("ErrorFailedToSendMail",$from,$sendto).' !</div>';
 		}	  
 	    }
 	  else
 	    {
-		  $msg='<div class="error">'.htmlentities($langs->trans("Le mail du destinataire est vide")).'</div>';
+		  $msg='<div class="error">'.$langs->trans("ErrorMailRecipientIsEmpty").' !</div>';
 	      dolibarr_syslog("Le mail du destinataire est vide");
 	    }
 
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index e9b93933688..fba621551ef 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -24,4 +24,6 @@ MailingStatusDraft=Draft
 MailingStatusValidated=Validated
 MailingStatusApproved=Approved
 MailingStatusSent=Sent
+MailSuccessfulySent=Mail successfuly sent
+ErrorMailRecipientIsEmpty=Mail recipient is empty
 
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 92629fea6aa..fc1905bb619 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -24,3 +24,5 @@ MailingStatusDraft=Brouillon
 MailingStatusValidated=Validé
 MailingStatusApproved=Apprové
 MailingStatusSent=Envoyé
+MailSuccessfulySent=Mail envoyé avec succès
+ErrorMailRecipientIsEmpty=Le mail du destinataire est vide
diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php
index 6340a88c46d..a6f2376f280 100644
--- a/htdocs/lib/CMailFile.class.php
+++ b/htdocs/lib/CMailFile.class.php
@@ -36,6 +36,7 @@ to chunk_split
 class CMailFile
 {
   var $subject;
+  var $addr_from;
   var $addr_to;
   var $addr_cc;
   var $addr_bcc;