diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 0257da8f0d0..b597e39ec3a 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -107,7 +107,7 @@ class CMailFile
 		$this->eol="\r\n";
 
 		// On defini mixed_boundary
-		$this->mixed_boundary = 'mul_'.dol_hash(uniqid("dolibarr1"));
+		$this->mixed_boundary = "multipart_x." . time() . ".x_boundary";
 
 		// On defini related_boundary
 		$this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2"));
@@ -589,8 +589,9 @@ class CMailFile
 		$host = dol_getprefix();
 
 		// Sender
-		//$out .= "Sender: ".getValidAddress($this->addr_from,2).$this->eol;
+		//$out .= "Sender: ".getValidAddress($this->addr_from,2m)).$this->eol;
 		$out .= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol;
+		//$out .= "From: ".$this->getValidAddress($this->addr_from,2,0).$this->eol;
 		//$out .= "Return-Path: ".$this->getValidAddress($this->addr_from,0,1).$this->eol;
 		if (isset($this->reply_to)  && $this->reply_to)  $out .= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol;
 		if (isset($this->errors_to) && $this->errors_to) $out .= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol;