diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index a9a588ae4d70e1f308b6ba2345bdf32a62eb4041..0b56e15a4e35773729b26aa96ab4768b9ad4d075 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -89,6 +89,7 @@ $actiontypecode='';
 $trigger_name='';
 $paramname='id';
 $mode='emailfortest';
+$trackid=(($action == 'testhtml')?"testhtml":"test");
 include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 if ($action == 'presend' && GETPOST('trackid') == 'test')       $action='test';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 2d21c0049a1ea09d82ce0ec714af9f32be6bcdc5..da6cfdaf15fd8d75371e68175e4fac40eee6771d 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -26,11 +26,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 /**
  * \file 		htdocs/comm/propal/card.php
  * \ingroup 	propale
  * \brief 		Page of commercial proposals card and list
  */
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
@@ -609,6 +611,7 @@ if (empty($reshook))
 	$trigger_name='PROPAL_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromproposal';
+	$trackid='pro'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 3f1f440ce310022c2d7ca7cdf73301f7b4b047f5..471b0216ee0e8da80e2a34261ad008364f059c72 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1256,6 +1256,7 @@ if (empty($reshook))
 	$trigger_name='ORDER_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromorder';
+	$trackid='ord'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index b2f1edc15c320826f82c3983b634c008c6f2075a..a5204f715223c170b81116acea7d9fdb0969c987 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1781,6 +1781,7 @@ if (empty($reshook))
 	$trigger_name='BILL_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfrominvoice';
+	$trackid='inv'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 53bd4f469f0311d984f318935cf688ca81daddd0..2a4803552140e24e5e1582a39bebf3d962ed5f80 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -551,6 +551,7 @@ if (empty($reshook))
 	$trigger_name='SHIPPING_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromshipment';
+	$trackid='shi'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 }
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index b2c7a779d329c4fcd1284342efe4aeb60d08faf0..aeeb2959210bc9705c5008dfcc7fa89c4282e4d9 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -766,6 +766,7 @@ if (empty($reshook))
 	$trigger_name='FICHINTER_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromintervention';
+	$trackid='int'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 41df1e4f31185bd7d405701f91ed069b2316f327..f56d78075c6e44a06b91b5ba2db41f39b99fe021 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1159,6 +1159,7 @@ if (empty($reshook))
 	$trigger_name='ORDER_SUPPLIER_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromsupplierorder';
+	$trackid='sor'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 2e0ef64f96fbf489bf5f81db1361db7ee133b542..7f3473f83a017853e95de86c80e29b71f7e58d2a 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -965,6 +965,7 @@ if (empty($reshook))
 	$trigger_name='BILL_SUPPLIER_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromsupplierinvoice';
+	$trackid='sin'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 3d561275c387a7e38ca5d33888d9a71e52846dc4..120f9badace655ccddc7efdfed194e6d9553a956 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -712,6 +712,7 @@ if (empty($reshook))
     $trigger_name='COMPANY_SENTBYMAIL';
     $paramname='socid';
     $mode='emailfromthirdparty';
+    $trackid='thi'.$object->id;
     include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
     // Actions to build doc
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 3cec12bac7d6f3b73abcef083bf71653b7a1dd61..ed44522f6b7e0f2afbbc0bbe109fc1884272784f 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -475,6 +475,7 @@ if (empty($reshook))
 	$trigger_name='SUPPLIER_PROPOSAL_SENTBYMAIL';
 	$paramname='id';
 	$mode='emailfromsupplierproposal';
+	$trackid='spr'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';