diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 0bce12b2918..3514ab6acfc 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -116,7 +116,7 @@ if (empty($reshook))
 	        exit;
 	    }
 	    else {
-	        setEventMessage($object->error,'errors');
+	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
 	
@@ -137,7 +137,7 @@ if (empty($reshook))
 		    }
 		    else 
 		    {
-		        setEventMessage($object->error,'errors');
+		        setEventMessages($object->error, $object->errors, 'errors');
 		    }
 		}
 	}
@@ -267,7 +267,7 @@ if (empty($reshook))
 	
 		        $id = $object->create($user);
 		        if ($id < 0) {
-		        	setEventMessage($object->error,'errors');
+		        	setEventMessages($object->error, $object->errors, 'errors');
 		        }
 	
 		        if ($id > 0)
@@ -364,13 +364,13 @@ if (empty($reshook))
 		            }
 		            else
 		            {
-		                setEventMessage($srcobject->error,'errors');
+		                setEventMessages($srcobject->error, $srcobject->errors, 'errors');
 		                $error++;
 		            }
 		        }
 		        else
 		        {
-		            setEventMessage($object->error,'errors');
+		            setEventMessages($object->error, $object->errors, 'errors');
 		            $error++;
 		        }
 		    }
@@ -383,7 +383,7 @@ if (empty($reshook))
 		            exit;
 		        }
 		        else {
-		        	setEventMessage($object->error,'errors');
+		        	setEventMessages($object->error, $object->errors, 'errors');
 		        }
 		        $action='create';
 			}
@@ -612,7 +612,7 @@ if (empty($reshook))
 	        }
 	        else
 	        {
-	        	setEventMessage($object->error,'errors');
+	        	setEventMessages($object->error, $object->errors, 'errors');
 	        }
 	    }
 	}
@@ -676,13 +676,13 @@ if (empty($reshook))
 	        }
 	        else
 	        {
-	        	setEventMessage($objectline->error,'errors');
+	        	setEventMessages($objectline->error, $objectline->errors, 'errors');
 	            $db->rollback();
 	        }
 	    }
 	    else
 	    {
-	    	setEventMessage($objectline->error,'errors');
+	    	setEventMessages($objectline->error, $objectline->errors, 'errors');
 	    }
 	}
 	
@@ -697,7 +697,7 @@ if (empty($reshook))
 	    }
 	    else
 	    {
-	    	setEventMessage($object->error,'errors');
+	    	setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
 	
@@ -722,7 +722,7 @@ if (empty($reshook))
 		}
 		else
 		{
-			setEventMessage($object->error,'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 	
@@ -741,7 +741,7 @@ if (empty($reshook))
 			}
 			else
 			{
-				setEventMessage($object->error,'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 		else
@@ -768,7 +768,7 @@ if (empty($reshook))
 	
 		if ($error) {
 			$action = 'edit_extras';
-			setEventMessage($object->error,'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} 
 	elseif ($action=='setref_supplier') 
@@ -778,12 +778,12 @@ if (empty($reshook))
 	
 			$result = $object->fetch($id);
 			if ($result < 0) {
-				setEventMessage($object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 	
 	        $result = $object->setValueFrom('ref_supplier',GETPOST('ref_supplier','alpha'));
 			if ($result < 0) {
-				setEventMessage($object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 				$action = 'editref_supplier';
 			} else {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -803,12 +803,12 @@ if (empty($reshook))
 		{
 			$result = $object->fetch($id);
 			if ($result < 0) {
-				setEventMessage($object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		
 	        $result = $object->setValueFrom('ref_customer',GETPOST('ref_customer','alpha'));
 	        if ($result < 0) {
-				setEventMessage($object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 				$action = 'editref_customer';
 			} else {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -827,12 +827,12 @@ if (empty($reshook))
 	    if (!$cancelbutton) {
 	        $result = $object->fetch($id);
 	        if ($result < 0) {
-	            setEventMessage($object->errors, 'errors');
+	            setEventMessages($object->error, $object->errors, 'errors');
 	        }
 	
 	        $result = $object->setValueFrom('ref',GETPOST('ref','alpha'));;
 	        if ($result < 0) {
-	            setEventMessage($object->errors, 'errors');
+	            setEventMessages($object->error, $object->errors, 'errors');
 	            $action = 'editref';
 	        } else {
 	            header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);
@@ -876,8 +876,8 @@ if (empty($reshook))
 			$upload_dir = $conf->contrat->dir_output;
 			$file = $upload_dir . '/' . GETPOST('file');
 			$ret = dol_delete_file($file, 0, 0, 0, $object);
-			if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('file')));
-			else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), 'errors');
+			if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
+			else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
 		}
 	}
 	
@@ -898,11 +898,11 @@ if (empty($reshook))
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
-					setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"),'errors');
+					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 				}
 				else
 				{
-					setEventMessage($object->error,'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
 		}
@@ -924,7 +924,7 @@ if (empty($reshook))
 				exit;
 			}
 			else {
-				setEventMessage($object->error,'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 	}
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 1528e472cbe..cd070f6078d 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -74,7 +74,7 @@ if ($action == 'addcontact' && $user->rights->contrat->creer)
 			$mesg = $object->error;
 		}
 
-		setEventMessage($mesg, 'errors');
+		setEventMessages($mesg, null, 'errors');
 	}
 }
 
diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index 27e5d8f602b..29ae4eb3365 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -102,7 +102,7 @@ if ($action == 'remove_file' && $permissioncreate)
     $filetodelete=GETPOST('file','alpha');
     $file =	$upload_dir	. '/' .	$filetodelete;
     $ret=dol_delete_file($file,0,0,0,$object);
-    if ($ret) setEventMessage($langs->trans("FileWasRemoved", $filetodelete));
-    else setEventMessage($langs->trans("ErrorFailToDeleteFile", $filetodelete), 'errors');
+    if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
+    else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
 }
 
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index 8ac95358bb8..b866c322158 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -165,7 +165,7 @@ if ($action == 'add')
                 );
     			if ($result > 0)
     			{
-    				setEventMessage($langs->trans('SetupSaved'));
+    				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
     				header("Location: ".$_SERVER["PHP_SELF"]);
     				exit;
     			}
@@ -173,7 +173,7 @@ if ($action == 'add')
     			{
                     $error++;
     			    $mesg=$extrafields->error;
-                    setEventMessage($mesg,'errors');
+                    setEventMessages($mesg, null, 'errors');
     			}
     		}
     		else
@@ -181,13 +181,13 @@ if ($action == 'add')
                 $error++;
     		    $langs->load("errors");
     			$mesg=$langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters",$langs->transnoentities("AttributeCode"));
-    			setEventMessage($mesg,'errors');
+    			setEventMessages($mesg, null, 'errors');
     			$action = 'create';
     		}
 	    }
 	    else
 	    {
-	    	setEventMessage($mesg,'errors');
+	    	setEventMessages($mesg, null, 'errors');
 	    }
 	}
 }
@@ -315,7 +315,7 @@ if ($action == 'update')
     			);
     			if ($result > 0)
     			{
-    				setEventMessage($langs->trans('SetupSaved'));
+    				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
     				header("Location: ".$_SERVER["PHP_SELF"]);
     				exit;
     			}
@@ -323,7 +323,7 @@ if ($action == 'update')
     			{
                     $error++;
     			    $mesg=$extrafields->error;
-    			    setEventMessage($mesg,'errors');
+    			    setEventMessages($mesg, null, 'errors');
     			}
     		}
     		else
@@ -331,12 +331,12 @@ if ($action == 'update')
     		    $error++;
     			$langs->load("errors");
     			$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
-    			setEventMessage($mesg,'errors');
+    			setEventMessages($mesg, null, 'errors');
     		}
 	    }
 	    else
 	    {
-	    	setEventMessage($mesg,'errors');
+	    	setEventMessages($mesg, null, 'errors');
 	    }
 	}
 }
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 1f96d085bb8..146fb231b4c 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -83,7 +83,7 @@ if(! empty($_POST['removAll']))
 		$result = dol_delete_file($pathtodelete,1); // Delete uploded Files 
 	
 		$langs->load("other");
-		setEventMessage($langs->trans("FileWasRemoved",$filetodelete));
+		setEventMessages($langs->trans("FileWasRemoved",$filetodelete), null, 'mesgs');
 		
 		$formmail->remove_attached_files($key); // Update Session
 	}
@@ -119,14 +119,14 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 			$possibleuser=$dolimail->get_from_user_by_mail($_POST['sendto'],"1"); // suche in llx_societe and socpeople
 			if (!$possibleaccounts && !$possibleuser) 
 			{
-					setEventMessage($langs->trans('ErrorFailedToFindSocieteRecord',$_POST['sendto']),'errors');
+					setEventMessages($langs->trans('ErrorFailedToFindSocieteRecord',$_POST['sendto']), null, 'errors');
 			}
 			elseif (count($possibleaccounts)>1) 
 			{
 					$sendtosocid=$possibleaccounts[1]['id'];
 					$result=$object->fetch($sendtosocid);
 					
-					setEventMessage($langs->trans('ErrorFoundMoreThanOneRecordWithEmail',$_POST['sendto'],$object->name));
+					setEventMessages($langs->trans('ErrorFoundMoreThanOneRecordWithEmail',$_POST['sendto'],$object->name), null, 'mesgs');
 			}
 			else 
 			{
@@ -251,7 +251,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 						{
 							$info = FALSE;
 							$err = $langs->trans('Error3_Imap_Connection_Error');
-							setEventMessage($err,$mailboxconfig->element,'errors');
+							setEventMessages($err,$mailboxconfig->element, null, 'errors');
 						} 
 						else 
 						{
@@ -291,12 +291,12 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 						{
 							// write mail to IMAP Server
 							$movemail = $mailboxconfig->putMail($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,$folder,$deliveryreceipt,$mailfile); 
-							if ($movemail) setEventMessage($langs->trans("MailMovedToImapFolder",$folder),'mesgs');
-							else setEventMessage($langs->trans("MailMovedToImapFolder_Warning",$folder),'warnings'); 
+							if ($movemail) setEventMessages($langs->trans("MailMovedToImapFolder",$folder), null, 'mesgs');
+							else setEventMessages($langs->trans("MailMovedToImapFolder_Warning",$folder), null, 'warnings'); 
 				 	 	}
 				 	}
 				 	
-					// Initialisation donnees
+					// Initialisation of datas
 					$object->socid			= $sendtosocid;	// To link to a company
 					$object->sendtoid		= $sendtoid;	// To link to a contact/address
 					$object->actiontypecode	= $actiontypecode;
@@ -305,14 +305,14 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					$object->fk_element		= $object->id;
 					$object->elementtype	= $object->element;
 
-					// Appel des triggers
+					// 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++; $this->errors=$interface->errors;
 					}
-					// Fin appel triggers
+					// End call of triggers
 
 					if ($error)
 					{
@@ -323,7 +323,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 						// Redirect here
 						// This avoid sending mail twice if going out and then back to page
 						$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));
-						setEventMessage($mesg);
+						setEventMessages($mesg, null, 'mesgs');
 						if($conf->dolimail->enabled) header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.$object->id.'&'.($paramname2?$paramname2:'mid').'='.$parm2val);
 						else	header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.$object->id);
 						exit;
@@ -344,7 +344,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 					}
 					$mesg.='</div>';
 
-					setEventMessage($mesg,'warnings');
+					setEventMessages($mesg, null, 'warnings');
 					$action = 'presend';
 				}
 			}
@@ -359,7 +359,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 		else
 		{
 			$langs->load("errors");
-			setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("MailTo")),'warnings');
+			setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("MailTo")), null, 'warnings');
 			dol_syslog('Try to send email with no recipiend defined', LOG_WARNING);
 			$action = 'presend';
 		}
@@ -367,7 +367,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 	else
 	{
 		$langs->load("other");
-		setEventMessage($langs->trans('ErrorFailedToReadEntity',$object->element),'errors');
+		setEventMessages($langs->trans('ErrorFailedToReadEntity',$object->element), null, 'errors');
 		dol_syslog('Failed to read data of object id='.$object->id.' element='.$object->element);
 		$action = 'presend';
 	}
diff --git a/htdocs/core/actions_setnotes.inc.php b/htdocs/core/actions_setnotes.inc.php
index dccce99cf9f..3fa76891124 100644
--- a/htdocs/core/actions_setnotes.inc.php
+++ b/htdocs/core/actions_setnotes.inc.php
@@ -33,7 +33,7 @@ if ($action == 'setnote_public' && ! empty($permissionnote) && ! GETPOST('cancel
 	if (empty($action) || ! is_object($object) || empty($id)) dol_print_error('','Include of actions_setnotes.inc.php was done but required variable was not set before');
 	if (empty($object->id)) $object->fetch($id);	// Fetch may not be already done
 	$result=$object->update_note(dol_html_entity_decode(GETPOST('note_public'), ENT_QUOTES),'_public');
-	if ($result < 0) setEventMessage($object->error,'errors');
+	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 }
 // Set public note
 else if ($action == 'setnote_private' && ! empty($permissionnote) && ! GETPOST('cancel'))
@@ -41,5 +41,5 @@ else if ($action == 'setnote_private' && ! empty($permissionnote) && ! GETPOST('
 	if (empty($action) || ! is_object($object) || empty($id)) dol_print_error('','Include of actions_setnotes.inc.php was done but required variable was not set before');
 	if (empty($object->id)) $object->fetch($id);	// Fetch may not be already done
 	$result=$object->update_note(dol_html_entity_decode(GETPOST('note_private'), ENT_QUOTES),'_private');
-	if ($result < 0) setEventMessage($object->error,'errors');
+	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 }
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 82754a309b9..5cdc9f39a14 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1511,7 +1511,7 @@ class ExtraFields
 
 			if($nofillrequired) {
 				$langs->load('errors');
-				setEventMessage($langs->trans('ErrorFieldsRequired').' : '.implode(', ',$error_field_required),'errors');
+				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ',$error_field_required), null, 'errors');
 				return -1;
 			}
 			else {
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 76151186f30..1f0cb5c6e28 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -301,7 +301,7 @@ class FormMail extends Form
         	$result = $this->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
         	if ($result<0)
         	{
-        		setEventMessage($this->error,'errors');
+        		setEventMessages($this->error, $this->errors, 'errors');
         	}
         	$modelmail_array=array();
         	foreach($this->lines_model as $line)
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 3e35e66336f..db6582ba332 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1470,22 +1470,22 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 					$imgThumbMini = vignette($destpath, 160, 120, '_mini', 50, "thumbs");
 				}
 
-				setEventMessage($langs->trans("FileTransferComplete"));
+				setEventMessages($langs->trans("FileTransferComplete"), null, 'mesgs');
 			}
 			else
 			{
 				$langs->load("errors");
 				if ($resupload < 0)	// Unknown error
 				{
-					setEventMessage($langs->trans("ErrorFileNotUploaded"), 'errors');
+					setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 				}
 				else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
 				{
-					setEventMessage($langs->trans("ErrorFileIsInfectedWithAVirus"), 'errors');
+					setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 				}
 				else	// Known error
 				{
-					setEventMessage($langs->trans($resupload), 'errors');
+					setEventMessages($langs->trans($resupload), null, 'errors');
 				}
 			}
 		}
@@ -1501,9 +1501,9 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
 			$res = $linkObject->create($user);
 			$langs->load('link');
 			if ($res > 0) {
-				setEventMessage($langs->trans("LinkComplete"));
+				setEventMessages($langs->trans("LinkComplete"), null, 'mesgs');
 			} else {
-				setEventMessage($langs->trans("ErrorFileNotLinked"), 'errors');
+				setEventMessages($langs->trans("ErrorFileNotLinked"), null, 'errors');
 			}
 		}
 	}
@@ -1549,7 +1549,7 @@ function dol_remove_file_process($filenb,$donotupdatesession=0,$donotdeletefile=
 			if (empty($donotdeletefile))
 			{
 				$langs->load("other");
-				setEventMessage($langs->trans("FileWasRemoved",$filetodelete));
+				setEventMessages($langs->trans("FileWasRemoved",$filetodelete), null, 'mesgs');
 			}
 			if (empty($donotupdatesession))
 			{
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index cb929daad3b..20c35bef497 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -139,7 +139,7 @@ if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POS
 	}
 	else
 	{
-		setEventMessage($result, 'errors');
+		setEventMessages($result, null, 'errors');
 		$_GET['file']=$_POST["file"];
 		$action='';
 	}
@@ -168,7 +168,7 @@ if ($action == 'confirm_crop')
 	}
 	else
 	{
-		setEventMessage($result, 'errors');
+		setEventMessages($result, null, 'errors');
 		$_GET['file']=$_POST["file"];
 		$action='';
 	}
diff --git a/htdocs/core/tpl/document_actions_pre_headers.tpl.php b/htdocs/core/tpl/document_actions_pre_headers.tpl.php
index 491e9e5cd8c..1c0d8a8367f 100644
--- a/htdocs/core/tpl/document_actions_pre_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_pre_headers.tpl.php
@@ -92,8 +92,8 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
 		        }
 	        }
 
-            if ($ret) setEventMessage($langs->trans("FileWasRemoved", $urlfile));
-            else setEventMessage($langs->trans("ErrorFailToDeleteFile", $urlfile), 'errors');
+            if ($ret) setEventMessages($langs->trans("FileWasRemoved", $urlfile), null, 'mesgs');
+            else setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors');
         }
         elseif ($linkid)
         {
@@ -105,12 +105,12 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
 
             $langs->load('link');
             if ($res > 0) {
-                setEventMessage($langs->trans("LinkRemoved", $link->label));
+                setEventMessages($langs->trans("LinkRemoved", $link->label), null, 'mesgs');
             } else {
                 if (count($link->errors)) {
                     setEventMessages('', $link->errors, 'errors');
                 } else {
-                    setEventMessage($langs->trans("ErrorFailedToDeleteLink", $link->label), 'errors');
+                    setEventMessages($langs->trans("ErrorFailedToDeleteLink", $link->label), null, 'errors');
                 }
             }
         }
@@ -136,7 +136,7 @@ elseif ($action == 'confirm_updateline' && GETPOST('save') && GETPOST('link', 'a
         $res = $link->update($user);
         if (!$res)
         {
-            setEventMessage($langs->trans("ErrorFailedToUpdateLink", $link->label));
+            setEventMessages($langs->trans("ErrorFailedToUpdateLink", $link->label), null, 'mesgs');
         }
     }
     else
diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php
index 6dc81bcc6a3..697b24fcc1e 100644
--- a/htdocs/cron/admin/cron.php
+++ b/htdocs/cron/admin/cron.php
@@ -37,7 +37,7 @@ if (! $user->admin)
 
 $actionsave=GETPOST("save");
 
-// Sauvegardes parametres
+// Save parameters
 if (!empty($actionsave))
 {
 	$i=0;
@@ -49,12 +49,12 @@ if (!empty($actionsave))
 	if ($i >= 1)
 	{
 		$db->commit();
-		setEventMessage($langs->trans("SetupSaved"));
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
 	else
 	{
 		$db->rollback();
-		setEventMessage($langs->trans("Error"), 'errors');
+		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 5e2766345de..474670e27cc 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -49,7 +49,7 @@ if (!empty($id))
 	$result=$object->fetch($id);
 	if ($result < 0)
 	{
-		setEventMessage($object->error,'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
@@ -73,7 +73,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->del
 
 	if ($result < 0)
 	{
-		setEventMessage($object->error,'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 		$action='edit';
 	}
 	else
@@ -90,7 +90,7 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
 
 	if ($result < 0)
 	{
-		setEventMessage($object->error,'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 		$action='';
 	}
 	else
@@ -98,13 +98,13 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
 		$res = $object->reprogram_jobs($user->login);
 		if ($res > 0)
 		{
-			if ($object->lastresult > 0) setEventMessage($langs->trans("JobFinished"),'warnings');
-			else setEventMessage($langs->trans("JobFinished"),'mesgs');
+			if ($object->lastresult > 0) setEventMessages($langs->trans("JobFinished"), null, 'warnings');
+			else setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
 			$action='';
 		}
 		else
 		{
-			setEventMessage($object->error,'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 			$action='';
 		}
 	}
@@ -134,11 +134,11 @@ if ($action=='add')
 
 	// test du Resultat de la requete
 	if ($result < 0) {
-		setEventMessage($object->error,'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 		$action='create';
 	}
 	else {
-		setEventMessage($langs->trans('CronSaveSucess'),'mesgs');
+		setEventMessages($langs->trans('CronSaveSucess'), null, 'mesgs');
 		$action='';
 	}
 }
@@ -168,11 +168,11 @@ if ($action=='update')
 
 	// test du Resultat de la requete
 	if ($result < 0) {
-		setEventMessage($object->error,'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 		$action='edit';
 	}
 	else {
-		setEventMessage($langs->trans('CronSaveSucess'),'mesgs');
+		setEventMessages($langs->trans('CronSaveSucess'), null, 'mesgs');
 		$action='';
 	}
 }
@@ -186,11 +186,11 @@ if ($action=='activate')
 
 	// test du Resultat de la requete
 	if ($result < 0) {
-		setEventMessage($object->error,'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 		$action='edit';
 	}
 	else {
-		setEventMessage($langs->trans('CronSaveSucess'),'mesgs');
+		setEventMessages($langs->trans('CronSaveSucess'), null, 'mesgs');
 		$action='';
 	}
 }
@@ -204,11 +204,11 @@ if ($action=='inactive')
 
 	// test du Resultat de la requete
 	if ($result < 0) {
-		setEventMessage($object->error,'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 		$action='edit';
 	}
 	else {
-		setEventMessage($langs->trans('CronSaveSucess'),'mesgs');
+		setEventMessages($langs->trans('CronSaveSucess'), null, 'mesgs');
 		$action='';
 	}
 }
@@ -277,7 +277,7 @@ if ($action == 'execute'){
 
 if (empty($object->status) && $action != 'create')
 {
-	setEventMessage($langs->trans("CronTaskInactive"), 'warnings');
+	setEventMessages($langs->trans("CronTaskInactive"), null, 'warnings');
 }
 
 if (($action=="create") || ($action=="edit"))
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index dd02db53bc8..65c2104b85f 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -85,7 +85,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->del
 	$result = $object->delete($user);
 
 	if ($result < 0) {
-		setEventMessage($object->error,'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
@@ -98,20 +98,20 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
 
 	$result = $object->run_jobs($user->login);
 	if ($result < 0) {
-		setEventMessage($object->error,'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 	}
 	else
 	{
 		$res = $object->reprogram_jobs($user->login);
 		if ($res > 0)
 		{
-			if ($object->lastresult > 0) setEventMessage($langs->trans("JobFinished"),'warnings');
-			else setEventMessage($langs->trans("JobFinished"),'mesgs');
+			if ($object->lastresult > 0) setEventMessages($langs->trans("JobFinished"), null, 'warnings');
+			else setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
 			$action='';
 		}
 		else
 		{
-			setEventMessage($object->error,'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 			$action='';
 		}
 	}
@@ -147,12 +147,12 @@ if ($action == 'execute')
 
 }
 
-// liste des jobs creer
+// list of jobs created
 $object = new Cronjob($db);
 $result=$object->fetch_all($sortorder, $sortfield, $limit, $offset, $status, $filter);
 if ($result < 0)
 {
-	setEventMessage($object->error,'errors');
+	setEventMessages($object->error, $object->errors, 'errors');
 }
 
 
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 81ef5431d09..2250c27ff7c 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005-2010  Laurent Destailleur  	<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2015	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2013       Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2015  Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Alexandre Spangaro		<aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -71,13 +71,13 @@ if ($action == 'specimen')
         }
         else
         {
-            setEventMessage($obj->error,'errors');
+            setEventMessages($obj->error, $obj->errors, 'errors');
             dol_syslog($obj->error, LOG_ERR);
         }
     }
     else
     {
-        setEventMessage($langs->trans("ErrorModuleNotFound"),'errors');
+        setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
         dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
 }
@@ -126,11 +126,11 @@ if ($action == 'set_DONATION_ACCOUNTINGACCOUNT')
 
  	if (! $error)
     {
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
@@ -144,11 +144,11 @@ if ($action == 'set_DONATION_MESSAGE')
 
  	if (! $error)
     {
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
@@ -160,9 +160,9 @@ else if ($action == 'setart200') {
 		$error ++;
 
 	if (! $error) {
-		setEventMessage($langs->trans("SetupSaved"), 'mesgs');
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
-		setEventMessage($langs->trans("Error"), 'mesgs');
+		setEventMessages($langs->trans("Error"), null, 'mesgs');
 	}
 }
 else if ($action == 'setart238') {
@@ -172,9 +172,9 @@ else if ($action == 'setart238') {
 		$error ++;
 
 	if (! $error) {
-		setEventMessage($langs->trans("SetupSaved"), 'mesgs');
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
-		setEventMessage($langs->trans("Error"), 'mesgs');
+		setEventMessages($langs->trans("Error"), null, 'mesgs');
 	}
 }
 else if ($action == 'setart885') {
@@ -184,9 +184,9 @@ else if ($action == 'setart885') {
 		$error ++;
 
 	if (! $error) {
-		setEventMessage($langs->trans("SetupSaved"), 'mesgs');
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
-		setEventMessage($langs->trans("Error"), 'mesgs');
+		setEventMessages($langs->trans("Error"), null, 'mesgs');
 	}
 }
 
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index ac64bcc90bd..ac12c46b879 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -192,8 +192,7 @@ if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights-
     else
     {
         dol_syslog($object->error,LOG_DEBUG);
-        setEventMessage($object->error,'errors');
-        setEventMessage($object->errors,'errors');
+        setEventMessages($object->error, $object->errors, 'errors');
     }
 }
 if ($action == 'valid_promesse')
@@ -204,7 +203,7 @@ if ($action == 'valid_promesse')
 		exit;
 	}
     else {
-	    setEventMessage($object->error, 'errors');
+	    setEventMessages($object->error, $object->errors, 'errors');
     }
 }
 if ($action == 'set_cancel')
@@ -215,7 +214,7 @@ if ($action == 'set_cancel')
         exit;
     }
     else {
-	    setEventMessage($object->error, 'errors');
+	    setEventMessages($object->error, $object->errors, 'errors');
     }
 }
 if ($action == 'set_paid')
@@ -226,7 +225,7 @@ if ($action == 'set_paid')
 		exit;
 	}
     else {
-	    setEventMessage($object->error, 'errors');
+	    setEventMessages($object->error, $object->errors, 'errors');
     }
 }
 // Remove file in doc form
@@ -243,8 +242,8 @@ if ($action == 'remove_file')
 		$upload_dir = $conf->don->dir_output;
 		$file = $upload_dir . '/' . GETPOST('file');
 		$ret=dol_delete_file($file,0,0,0,$object);
-		if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
-		else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 		$action='';
 	}
 }
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 2d89c6252f6..fc0b4ae0c78 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -66,7 +66,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->don->supp
 	}
 	else
 	{
-		setEventMessage($payment->error, 'errors');
+		setEventMessages($payment->error, $payment->errors, 'errors');
         $db->rollback();
 	}
 }
@@ -104,7 +104,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->don->cree
 	}
 	else
 	{
-		setEventMessage($payment->error);
+		setEventMessages($payment->error, $payment->errors, 'errors');
 		$db->rollback();
 	}
 }
diff --git a/htdocs/ecm/docdir.php b/htdocs/ecm/docdir.php
index 07c6a6029e8..7cd3a235c6b 100644
--- a/htdocs/ecm/docdir.php
+++ b/htdocs/ecm/docdir.php
@@ -117,18 +117,18 @@ if ($action == 'add' && $user->rights->ecm->setup)
 		else
 		{
 			$langs->load("errors");
-			setEventMessage($langs->trans($ecmdir->error), 'errors');
-			setEventMessage($ecmdir->errors, 'errors');
+			setEventMessages($langs->trans($ecmdir->error), null, 'errors');
+			setEventMessages($ecmdir->error, $ecmdir->errors, 'errors');
 			$action = 'create';
 		}
 	}
 }
 
-// Suppression fichier
+// Deleting file
 else if ($action == 'confirm_deletesection' && $confirm == 'yes')
 {
 	$result=$ecmdir->delete($user);
-	setEventMessage($langs->trans("ECMSectionWasRemoved", $ecmdir->label));
+	setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
 }
 
 
diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php
index 7f70cb3b500..2ec6dfc4aae 100644
--- a/htdocs/ecm/docmine.php
+++ b/htdocs/ecm/docmine.php
@@ -88,23 +88,23 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
    			$langs->load("errors");
 			if ($resupload < 0)	// Unknown error
 			{
-				setEventMessage($langs->trans("ErrorFileNotUploaded"), 'errors');
+				setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 			}
 			else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
 			{
-				setEventMessage($langs->trans("ErrorFileIsInfectedWithAVirus"), 'errors');
+				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 			}
 			else	// Known error
 			{
-				setEventMessage($langs->trans($resupload), 'errors');
+				setEventMessages($langs->trans($resupload), null, 'errors');
 			}
 	    }
 	}
 	else
 	{
-	    // Echec transfert (fichier depassant la limite ?)
+	    // Failed transfer (exceeding the limit file?)
 		$langs->load("errors");
-		setEventMessage($langs->trans("ErrorFailToCreateDir",$upload_dir), 'errors');
+		setEventMessages($langs->trans("ErrorFailToCreateDir",$upload_dir), null, 'errors');
 	}
 }
 
@@ -133,7 +133,7 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes')
 	else
 	{
 		$langs->load('errors');
-		setEventMessage($langs->trans($ecmdir->error,$ecmdir->label), 'errors');
+		setEventMessages($langs->trans($ecmdir->error,$ecmdir->label), null, 'errors');
 	}
 }
 
@@ -164,7 +164,7 @@ if ($action == 'update' && ! GETPOST('cancel'))
 			if (! $result)
 			{
 				$langs->load('errors');
-				setEventMessage($langs->trans('ErrorFailToRenameDir',$olddir,$newdir), 'errors');
+				setEventMessages($langs->trans('ErrorFailToRenameDir',$olddir,$newdir), null, 'errors');
 				$error++;
 			}
 		}
@@ -184,7 +184,7 @@ if ($action == 'update' && ! GETPOST('cancel'))
 	else
 	{
 		$db->rollback();
-		setEventMessage($ecmdir->error, 'errors');
+		setEventMessages($ecmdir->error, $ecmdir->errors, 'errors');
 	}
 }
 
@@ -201,7 +201,7 @@ llxHeader();
 $form=new Form($db);
 
 
-// Construit liste des fichiers
+// Built the file List
 $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 $totalsize=0;
 foreach($filearray as $key => $file)
@@ -349,7 +349,7 @@ if ($action == 'delete_dir')
 $formfile=new FormFile($db);
 
 /*
-// Affiche formulaire upload
+// Display upload form
 if ($user->rights->ecm->upload)
 {
 	$formfile->form_attach_new_file(DOL_URL_ROOT.'/ecm/docmine.php','',0,$section);
diff --git a/htdocs/ecm/docother.php b/htdocs/ecm/docother.php
index 3efe0716228..2f0f231523f 100644
--- a/htdocs/ecm/docother.php
+++ b/htdocs/ecm/docother.php
@@ -55,15 +55,15 @@ if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
    			$langs->load("errors");
 			if ($resupload < 0)	// Unknown error
 			{
-				setEventMessage($langs->trans("ErrorFileNotUploaded"), 'errors');
+				setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 			}
 			else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
 			{
-				setEventMessage($langs->trans("ErrorFileIsInfectedWithAVirus"), 'errors');
+				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 			}
 			else	// Known error
 			{
-				setEventMessage($langs->trans($resupload), 'errors');
+				setEventMessages($langs->trans($resupload), null, 'errors');
 			}
 	    }
 	}
@@ -81,8 +81,8 @@ if ($_POST['action'] == 'confirm_deletefile' && $_POST['confirm'] == 'yes')
     $langs->load("other");
 	$file = $upload_dir . "/" . GETPOST('urlfile');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 	$ret=dol_delete_file($file);
-	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
-	else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 }
 
 
@@ -106,7 +106,7 @@ print load_fiche_titre($langs->trans("ECMAutoOrg"));
 
 
 /*
- * Confirmation de la suppression d'une ligne produit
+ * Confirmation of deleting a product line
  */
 if ($_GET['action'] == 'delete_file')
 {
@@ -114,7 +114,7 @@ if ($_GET['action'] == 'delete_file')
 
 }
 
-// Construit liste des fichiers
+// Construct files list
 clearstatcache();
 $totalsize=0;
 $filearray=array();
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 54c514ec1f2..e3fa4ece95d 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -117,22 +117,22 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 				$langs->load("errors");
 				if ($resupload < 0)	// Unknown error
 				{
-					setEventMessage($langs->trans("ErrorFileNotUploaded"), 'errors');
+					setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 				}
 				else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
 				{
-					setEventMessage($langs->trans("ErrorFileIsInfectedWithAVirus"), 'errors');
+					setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 				}
 				else	// Known error
 				{
-					setEventMessage($langs->trans($resupload), 'errors');
+					setEventMessages($langs->trans($resupload), null, 'errors');
 				}
 			}
 		}
 		else
 		{
 			$langs->load("errors");
-			setEventMessage($langs->trans("ErrorFailToCreateDir",$upload_dir), 'errors');
+			setEventMessages($langs->trans("ErrorFailToCreateDir",$upload_dir), null, 'errors');
 		}
 	}
 }
@@ -154,7 +154,7 @@ if ($action == 'add' && $user->rights->ecm->setup)
 	}
 	else
 	{
-		setEventMessage('Error '.$langs->trans($ecmdir->error), 'errors');
+		setEventMessages('Error '.$langs->trans($ecmdir->error), null, 'errors');
 		$action = "create";
 	}
 
@@ -182,8 +182,8 @@ if ($action == 'confirm_deletefile')
     	$file = $upload_dir . "/" . GETPOST('urlfile');	// Do not use urldecode here ($_GET and $_POST are already decoded by PHP).
 
     	$ret=dol_delete_file($file);
-    	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
-    	else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+    	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+    	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 
     	$result=$ecmdir->changeNbOfFiles('-');
 
@@ -196,7 +196,7 @@ if ($action == 'confirm_deletefile')
 if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes')
 {
 	$result=$ecmdir->delete($user);
-	setEventMessage($langs->trans("ECMSectionWasRemoved", $ecmdir->label));
+	setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
 
     clearstatcache();
 }
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 0531050aa3d..76ce04235e4 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -117,22 +117,22 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 				$langs->load("errors");
 				if ($resupload < 0)	// Unknown error
 				{
-					setEventMessage($langs->trans("ErrorFileNotUploaded"), 'errors');
+					setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 				}
 				else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
 				{
-					setEventMessage($langs->trans("ErrorFileIsInfectedWithAVirus"), 'errors');
+					setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 				}
 				else	// Known error
 				{
-					setEventMessage($langs->trans($resupload), 'errors');
+					setEventMessages($langs->trans($resupload), null, 'errors');
 				}
 			}
 		}
 		else
 		{
 			$langs->load("errors");
-			setEventMessage($langs->trans("ErrorFailToCreateDir",$upload_dir), 'errors');
+			setEventMessages($langs->trans("ErrorFailToCreateDir",$upload_dir), null, 'errors');
 		}
 	}
 }
@@ -155,7 +155,7 @@ if ($action == 'add' && $user->rights->ecm->setup)
 	else
 	{
 		//TODO: Translate
-		setEventMessage('Error '.$langs->trans($ecmdir->error), 'errors');
+		setEventMessages('Error '.$langs->trans($ecmdir->error), null, 'errors');
 		$action = "create";
 	}
 
@@ -183,8 +183,8 @@ if ($action == 'confirm_deletefile')
     	$file = $upload_dir . "/" . GETPOST('urlfile');	// Do not use urldecode here ($_GET and $_POST are already decoded by PHP).
 
     	$ret=dol_delete_file($file);
-    	if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
-    	else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+    	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+    	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 
     	$result=$ecmdir->changeNbOfFiles('-');
 
@@ -197,7 +197,7 @@ if ($action == 'confirm_deletefile')
 if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes')
 {
 	$result=$ecmdir->delete($user);
-	setEventMessage($langs->trans("ECMSectionWasRemoved", $ecmdir->label));
+	setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
 
     clearstatcache();
 }