diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index dfc731052554ba0a36bab3c12997729d4d80fdd2..3ac6fb362894cb94f387f6dc898f4c6b634f3548 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -103,12 +103,11 @@ if (GETPOST('removAll'))
 if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_POST['removAll'] && ! $_POST['removedfile'] && ! $_POST['cancel'] && !$_POST['modelselected'])
 {
 	$trackid = GETPOST('trackid','aZ09');
-
+	$subject='';$actionmsg='';$actionmsg2='';
+	
     if (! empty($conf->dolimail->enabled)) $langs->load("dolimail@dolimail");
 	$langs->load('mails');
 
-	$subject='';$actionmsg='';$actionmsg2='';
-
 	if (is_object($object))
 	{
     	$result=$object->fetch($id);
@@ -323,6 +322,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					$object->actiontypecode	= $actiontypecode;
 					$object->actionmsg		= $actionmsg;  // Long text
 					$object->actionmsg2		= $actionmsg2; // Short text
+					$object->trackid        = $trackid;
 					$object->fk_element		= $object->id;
 					$object->elementtype	= $object->element;
 
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 2f9c1a132d5b4eaba65575fb8d0eba7986e3d986..72760e7e72fbb5bf1dcf7309b5d81993cc4c9242 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -756,9 +756,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
         // Add entry in event table
 		$now=dol_now();
 
-		if (isset($_SESSION['listofnames']))
+		if (isset($_SESSION['listofnames-'.$object->trackid]))
 		{
-			$attachs=$_SESSION['listofnames'];
+			$attachs=$_SESSION['listofnames-'.$object->trackid];
 			if ($attachs && strpos($action,'SENTBYMAIL'))
 			{
                 $object->actionmsg=dol_concatdesc($object->actionmsg, "\n".$langs->transnoentities("AttachedFiles").': '.$attachs);