diff --git a/htdocs/includes/simplemail/class.mail.php b/htdocs/includes/simplemail/class.mail.php
index 43a363f9b5f..919bb0cb075 100644
--- a/htdocs/includes/simplemail/class.mail.php
+++ b/htdocs/includes/simplemail/class.mail.php
@@ -293,6 +293,7 @@ class simplemail {
 		if ( !empty($this->hfrom) ) $this->AddField2Header("From",$this->hfrom);
 
 		if ( !empty($this->returnpath) ) $this->AddField2Header("Return-Path",$this->returnpath);
+		else { $this->AddField2Header("Return-Path",$this->hfrom); }
 
 		if ( !empty($this->replyto) ) $this->AddField2Header("Reply-To",$this->replyto);
 
diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php
index a8db93d058a..b80a4ae61e1 100644
--- a/htdocs/lib/CMailFile.class.php
+++ b/htdocs/lib/CMailFile.class.php
@@ -230,6 +230,12 @@ class CMailFile
 			$mail->B3B = $this->alternative_boundary;
 
 			$mail->XMailer = "Dolibarr version " . DOL_VERSION ." (using simplemail)";
+			
+			// Add Errors-To
+			$mail->ErrorsTo = $this->getValidAddress($errors_to,1);
+			
+			//Add Return-Path
+			$mail->returnpath = $this->getValidAddress($errors_to,1);
 
 			// Add from
 			$this->addr_from = $from;
@@ -771,7 +777,7 @@ class CMailFile
 			}
 			if ($this->css['bgimage'])
 			{
-				// Todo: récupérer cid
+				// Todo: r�cup�rer cid
 				$out.= '  background-image: url("cid:'.$this->css['bgimage_cid'].'");';
 			}
 			$out.= '}';