diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 5fa752d9619..18b9cfb9b4f 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -92,11 +92,11 @@ class CMailFile
 	 *	@param 	array	$mimetype_list       List of MIME type of attached files
 	 *	@param 	array	$mimefilename_list   List of attached file name in message
 	 *	@param 	string	$addr_cc             Email cc
-	 *	@param 	string	$addr_bcc            Email bcc
-	 *	@param 	int		$deliveryreceipt		Ask a delivery receipt
-	 *	@param 	int		$msgishtml       	1=String IS already html, 0=String IS NOT html, -1=Unknown need autodetection
-	 *	@param 	string	$errors_to      		Email errors
-	 *	@param	string	$css			        Css option
+	 *	@param 	string	$addr_bcc            Email bcc (Note: This is autocompleted with MAIN_MAIL_AUTOCOPY_TO if defined)
+	 *	@param 	int		$deliveryreceipt     Ask a delivery receipt
+	 *	@param 	int		$msgishtml           1=String IS already html, 0=String IS NOT html, -1=Unknown make autodetection (with fast mode, not reliable)
+	 *	@param 	string	$errors_to      	 Email errors
+	 *	@param	string	$css                 Css option
 	 */
 	function __construct($subject,$to,$from,$msg,
 	$filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(),
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 691d85838f3..4377a4cbf96 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -118,8 +118,10 @@ if (! empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL))
 	$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
 	$content.="tag=".$fulltag."\n";
 	
+	$ishtml=dol_textishtml($content);	// May contain urls
+	
 	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-	$mailfile = new CMailFile($topic, $sendto, $from, $content);
+	$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
 
 	$result=$mailfile->sendfile();
 	if ($result)
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index ec4c8b7cd4f..54abcd1b02e 100644
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -184,6 +184,7 @@ if ($PAYPALTOKEN)
 				$content="";
 				if (! empty($tmptag['MEM']))
 				{
+					$langs->load("members");
 					$url=$urlwithroot."/adherents/card_subscriptions.php?rowid=".$tmptag['MEM'];
 					$content.=$langs->trans("PaymentSubscription")."\n";
 					$content.=$langs->trans("MemberId").': '.$tmptag['MEM']."\n";
@@ -198,8 +199,10 @@ if ($PAYPALTOKEN)
 				$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
 				$content.="tag=".$fulltag." token=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
 				
+				$ishtml=dol_textishtml($content);	// May contain urls
+
 				require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-				$mailfile = new CMailFile($topic, $sendto, $from, $content);
+				$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
 		
 				$result=$mailfile->sendfile();
 				if ($result)
@@ -247,8 +250,10 @@ if ($PAYPALTOKEN)
 				$content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."\n";
 				$content.="tag=".$fulltag."\ntoken=".$token." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
 				
+				$ishtml=dol_textishtml($content);	// May contain urls
+				
 				require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-				$mailfile = new CMailFile($topic, $sendto, $from, $content);
+				$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
 		
 				$result=$mailfile->sendfile();
 				if ($result)