diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index f403f526d46..d031f318eb9 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -1,25 +1,25 @@
 <?php
 /* Copyright (C) 2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * or see http://www.gnu.org/
- */
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+* or see http://www.gnu.org/
+*/
 
 /**
  *	\file			htdocs/core/actions_sendmails.inc.php
- *  \brief			Code for actions on sending mails from object page
- */
+*  \brief			Code for actions on sending mails from object page
+*/
 
 // $mysoc must be defined
 // $id must be defined
@@ -31,12 +31,12 @@
 
 /*
  * Add file in email form
- */
+*/
 if (GETPOST('addfile'))
 {
 	$trackid = GETPOST('trackid','aZ09');
-	
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 	// Set tmp user directory
 	$vardir=$conf->user->dir_output."/".$user->id;
@@ -52,7 +52,7 @@ if (GETPOST('addfile'))
 if (! empty($_POST['removedfile']) && empty($_POST['removAll']))
 {
 	$trackid = GETPOST('trackid','aZ09');
-    
+
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 	// Set tmp user directory
@@ -71,11 +71,11 @@ if (! empty($_POST['removedfile']) && empty($_POST['removAll']))
 if (GETPOST('removAll'))
 {
 	$trackid = GETPOST('trackid','aZ09');
-	
-    $listofpaths=array();
+
+	$listofpaths=array();
 	$listofnames=array();
 	$listofmimes=array();
-    $keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
+	$keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
 	if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';',$_SESSION["listofpaths".$keytoavoidconflict]);
 	if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';',$_SESSION["listofnames".$keytoavoidconflict]);
 	if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';',$_SESSION["listofmimes".$keytoavoidconflict]);
@@ -83,7 +83,7 @@ if (GETPOST('removAll'))
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	$formmail = new FormMail($db);
 	$formmail->trackid = $trackid;
-	
+
 	foreach($listofpaths as $key => $value)
 	{
 		$pathtodelete = $value;
@@ -104,57 +104,57 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 {
 	$trackid = GETPOST('trackid','aZ09');
 	$subject='';$actionmsg='';$actionmsg2='';
-	
-    if (! empty($conf->dolimail->enabled)) $langs->load("dolimail@dolimail");
+
+	if (! empty($conf->dolimail->enabled)) $langs->load("dolimail@dolimail");
 	$langs->load('mails');
 
 	if (is_object($object))
 	{
-    	$result=$object->fetch($id);
-    
-    	$sendtosocid=0;    // Thirdparty on object
-    	if (method_exists($object,"fetch_thirdparty") && $object->element != 'societe')
-    	{
-    		$result=$object->fetch_thirdparty();
-    		$thirdparty=$object->thirdparty;
-    		$sendtosocid=$thirdparty->id;
-    	}
-    	else if ($object->element == 'societe')
-    	{
-    		$thirdparty=$object;
-    		if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
-    		elseif (! empty($conf->dolimail->enabled))
-    		{
-    			$dolimail = new Dolimail($db);
-    			$possibleaccounts=$dolimail->get_societe_by_email($_POST['sendto'],"1");
-    			$possibleuser=$dolimail->get_from_user_by_mail($_POST['sendto'],"1"); // suche in llx_societe and socpeople
-    			if (!$possibleaccounts && !$possibleuser) 
-    			{
-    					setEventMessages($langs->trans('ErrorFailedToFindSocieteRecord',$_POST['sendto']), null, 'errors');
-    			}
-    			elseif (count($possibleaccounts)>1) 
-    			{
-    					$sendtosocid=$possibleaccounts[1]['id'];
-    					$result=$object->fetch($sendtosocid);
-    					
-    					setEventMessages($langs->trans('ErrorFoundMoreThanOneRecordWithEmail',$_POST['sendto'],$object->name), null, 'mesgs');
-    			}
-    			else 
-    			{
-    				if($possibleaccounts){ 
-    					$sendtosocid=$possibleaccounts[1]['id'];
-    					$result=$object->fetch($sendtosocid);
-    				}elseif($possibleuser){ 
-    					$sendtosocid=$possibleuser[0]['id'];
-    
-    					$result=$uobject->fetch($sendtosocid);
-    					$object=$uobject;
-    				}
-    				
-    			}
-    		}
-    	}
-    	else dol_print_error('','Use actions_sendmails.in.php for a type that is not supported');
+		$result=$object->fetch($id);
+
+		$sendtosocid=0;    // Thirdparty on object
+		if (method_exists($object,"fetch_thirdparty") && $object->element != 'societe')
+		{
+			$result=$object->fetch_thirdparty();
+			$thirdparty=$object->thirdparty;
+			$sendtosocid=$thirdparty->id;
+		}
+		else if ($object->element == 'societe')
+		{
+			$thirdparty=$object;
+			if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
+			elseif (! empty($conf->dolimail->enabled))
+			{
+				$dolimail = new Dolimail($db);
+				$possibleaccounts=$dolimail->get_societe_by_email($_POST['sendto'],"1");
+				$possibleuser=$dolimail->get_from_user_by_mail($_POST['sendto'],"1"); // suche in llx_societe and socpeople
+				if (!$possibleaccounts && !$possibleuser)
+				{
+					setEventMessages($langs->trans('ErrorFailedToFindSocieteRecord',$_POST['sendto']), null, 'errors');
+				}
+				elseif (count($possibleaccounts)>1)
+				{
+					$sendtosocid=$possibleaccounts[1]['id'];
+					$result=$object->fetch($sendtosocid);
+						
+					setEventMessages($langs->trans('ErrorFoundMoreThanOneRecordWithEmail',$_POST['sendto'],$object->name), null, 'mesgs');
+				}
+				else
+				{
+					if($possibleaccounts){
+						$sendtosocid=$possibleaccounts[1]['id'];
+						$result=$object->fetch($sendtosocid);
+					}elseif($possibleuser){
+						$sendtosocid=$possibleuser[0]['id'];
+
+						$result=$uobject->fetch($sendtosocid);
+						$object=$uobject;
+					}
+
+				}
+			}
+		}
+		else dol_print_error('','Use actions_sendmails.in.php for a type that is not supported');
 	}
 	else $thirdparty = $mysoc;
 
@@ -169,8 +169,8 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 		$receiver=$_POST['receiver'];
 		if (! is_array($receiver))
 		{
-		    if ($receiver == '-1') $receiver=array();
-		    else $receiver=array($receiver);
+			if ($receiver == '-1') $receiver=array();
+			else $receiver=array($receiver);
 		}
 		$tmparray=array();
 		if (trim($_POST['sendto']))
@@ -180,7 +180,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 		}
 		if (count($receiver)>0)
 		{
-			foreach($receiver as $key=>$val) 
+			foreach($receiver as $key=>$val)
 			{
 				// Recipient was provided from combo list
 				if ($val == 'thirdparty') // Id of third party
@@ -195,13 +195,13 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 			}
 		}
 		$sendto=implode(',',$tmparray);
-		
+
 		// Define $sendtocc
 		$receivercc=$_POST['receivercc'];
 		if (! is_array($receivercc))
 		{
-		    if ($receivercc == '-1') $receivercc=array();
-		    else $receivercc=array($receivercc);
+			if ($receivercc == '-1') $receivercc=array();
+			else $receivercc=array($receivercc);
 		}
 		$tmparray=array();
 		if (trim($_POST['sendtocc']))
@@ -210,7 +210,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 		}
 		if (count($receivercc) > 0)
 		{
-			foreach($receivercc as $key=>$val) 
+			foreach($receivercc as $key=>$val)
 			{
 				// Recipient was provided from combo list
 				if ($val == 'thirdparty') // Id of third party
@@ -225,35 +225,35 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 			}
 		}
 		$sendtocc=implode(',',$tmparray);
-		
+
 		if (dol_strlen($sendto))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-		    
+
 			$langs->load("commercial");
 
 			$fromtype = GETPOST('fromtype');
-            if ($fromtype === 'user') {
-                $from = $user->getFullName($langs) .' <'.$user->email.'>';
-            }
-            elseif ($fromtype === 'company') {
-                $from = $conf->global->MAIN_INFO_SOCIETE_NOM .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
-            }
-		    elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
-		        $tmp=explode(',', $user->email_aliases);
-                $from = trim($tmp[($reg[1] - 1)]);
-            }
-		    elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
-                $tmp=explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
-                $from = trim($tmp[($reg[1] - 1)]);
-            }
-            else {
-                $from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
-            }
+			if ($fromtype === 'user') {
+				$from = $user->getFullName($langs) .' <'.$user->email.'>';
+			}
+			elseif ($fromtype === 'company') {
+				$from = $conf->global->MAIN_INFO_SOCIETE_NOM .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+			}
+			elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+				$tmp=explode(',', $user->email_aliases);
+				$from = trim($tmp[($reg[1] - 1)]);
+			}
+			elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
+				$tmp=explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
+				$from = trim($tmp[($reg[1] - 1)]);
+			}
+			else {
+				$from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
+			}
 
-            $replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>';
+			$replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>';
 			$message = $_POST['message'];
-			
+				
 			$sendtobcc= GETPOST('sendtoccc');
 			if ($mode == 'emailfromproposal') $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO));
 			if ($mode == 'emailfromorder')    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO));
@@ -261,7 +261,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 			if ($mode == 'emailfromsupplierproposal') $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO));
 			if ($mode == 'emailfromsupplierorder')    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO));
 			if ($mode == 'emailfromsupplierinvoice')  $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO));
-				
+
 			$deliveryreceipt = $_POST['deliveryreceipt'];
 
 			if ($action == 'send' || $action == 'relance')
@@ -283,7 +283,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 			$formmail = new FormMail($db);
 			$formmail->trackid = $trackid;      // $trackid must be defined
-            
+
 			$attachedfiles=$formmail->get_attached_files();
 			$filepath = $attachedfiles['paths'];
 			$filename = $attachedfiles['names'];
@@ -356,37 +356,37 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 							$dolimail=new DoliMail($db);
 							$dolimail->id = $mid;
 							$res=$dolimail->set_prop($user, 'answered',1);
-				  		}
+						}
 						if ($imap==1)
 						{
 							// write mail to IMAP Server
 							$movemail = $mailboxconfig->putMail($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$folder,$deliveryreceipt,$mailfile);
 							if ($movemail) setEventMessages($langs->trans("MailMovedToImapFolder",$folder), null, 'mesgs');
 							else setEventMessages($langs->trans("MailMovedToImapFolder_Warning",$folder), null, 'warnings');
-				 	 	}
-				 	}
+						}
+					}
 
 					// Initialisation of datas
 					if (is_object($object))
 					{
-					    $object->socid			= $sendtosocid;	// To link to a company
-					    $object->sendtoid		= $sendtoid;	// To link to contacts/addresses. This is an array.
-					    $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;
-		    
-					    // Call of triggers
-					    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-					    $interface=new Interfaces($db);
-					    $result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
-					    if ($result < 0) {
-					    	$error++; $errors=$interface->errors;
-					    }					    
+						$object->socid			= $sendtosocid;	// To link to a company
+						$object->sendtoid		= $sendtoid;	// To link to contacts/addresses. This is an array.
+						$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;
+
+						// Call of triggers
+						include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+						$interface=new Interfaces($db);
+						$result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
+						if ($result < 0) {
+							$error++; $errors=$interface->errors;
+						}
 					}
-					
+						
 					if ($error)
 					{
 						dol_print_error($db);
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index a2501867b56..8315bb5cce3 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -865,6 +865,21 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 		$ret=$actioncomm->create($user);       // User creating action
 		
+		if ($ret > 0 && $conf->global->MAIN_COPY_FILE_IN_EVENT_AUTO)
+		{
+			if (is_array($object->attachedfiles) && array_key_exists('paths',$object->attachedfiles) && count($object->attachedfiles['paths'])>0) {
+				foreach($object->attachedfiles['paths'] as $key=>$filespath) {
+					$srcfile = $filespath;
+					$destdir = $conf->agenda->dir_output . '/' . $ret;
+					$destfile = $destdir . '/' . $object->attachedfiles['names'][$key];
+					if (dol_mkdir($destdir) >= 0) {
+						require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+						dol_copy($srcfile, $destfile);
+					}
+				}
+			}
+		}
+		
 		unset($object->actionmsg); unset($object->actionmsg2); unset($object->actiontypecode);	// When several action are called on same object, we must be sure to not reuse value of first action.
 		
 		if ($ret > 0)