diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 104152b5de0..ddbbd1bccda 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -167,19 +167,22 @@ if ($mil->fetch($_GET["id"]) == 0)
     
     if ($mesg) print "$mesg<br>\n";
 
+    $var=!$var;
+
     // Affiche les listes de sélection
     if ($mil->statut == 0)
     {
+        print '<form action="cibles.php?action=clear&rowid='.$mil->id.'" method="POST">';
+        print_titre($langs->trans("ToClearAllRecipientsClickHere").': &nbsp; <input type="submit" class="button" value="'.$langs->trans("TargetsReset").'"></form>');
+        print '<br>';
+                
+        print_titre($langs->trans("ToAddRecipientsChooseHere").':');
         print '<table class="noborder" width=\"100%\">';
         print '<tr class="liste_titre">';
         print '<td>'.$langs->trans("RecipientSelectionModules").'</td>';
         print '<td align="center">'.$langs->trans("NbOfUniqueEMails").'</td>';
         print '<td align="center">'.$langs->trans("Parameters").'</td>';
-        print '<td align="center" width="120">';
-        if ($mil->statut == 0) {
-           print $langs->trans("Actions");
-        }
-        print '</td>';
+        print '<td align="center" width="120">&nbsp;</td>';
         print "</tr>\n";
         
         clearstatcache();
@@ -256,11 +259,6 @@ if ($mil->fetch($_GET["id"]) == 0)
         }
         closedir($handle);
 
-        $var=!$var;
-        print '<tr '.$bc[$var].'>';
-        print '<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td align="center"><form action="cibles.php?action=clear&rowid='.$mil->id.'" method="POST"><input type="submit" class="button" value="'.$langs->trans("TargetsReset").'"></form></td>';
-        print '</tr>';
-
         print '</table><br>';
     }
     
diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index 9f33588d684..c81fe94259e 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -239,10 +239,11 @@ if ($_GET["action"] == 'create')
     print '<tr><td width="25%">'.$langs->trans("MailTopic").'</td><td><input class="flat" name="sujet" size="60" value=""></td></tr>';
     print '<tr><td width="25%" valign="top">'.$langs->trans("MailMessage").'<br>';
     print '<br><i>'.$langs->trans("CommonSubstitutions").':<br>';
+    print '__ID__ = '.$langs->trans("IdRecord").'<br>';
     print '__EMAIL__ = '.$langs->trans("EMail").'<br>';
     print '__LASTNAME__ = '.$langs->trans("Lastname").'<br>';
     print '__FIRSTNAME__ = '.$langs->trans("Firstname").'<br>';
-    print '</td>';
+    print '</i></td>';
     print '<td><textarea cols="70" rows="10" name="body"></textarea></td></tr>';
     print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("CreateMailing").'"></td></tr>';
     print '</table>';
@@ -333,7 +334,9 @@ else
 
             // Contenu du mail
             print '<tr><td>'.$langs->trans("MailTopic").'</td><td colspan="3">'.$mil->sujet.'</td></tr>';
-            print '<tr><td valign="top">'.$langs->trans("MailMessage").'</td><td colspan="3">';
+            print '<tr><td valign="top">'.$langs->trans("MailMessage").'</td>';
+
+            print '<td colspan="3">';
             print nl2br($mil->body).'</td></tr>';
 
             print '</table>';
@@ -420,7 +423,14 @@ else
             print '<tr><td width="25%">'.$langs->trans("MailTitle").'</td><td colspan="3"><input class="flat" type="text" size=40 name="titre" value="'.htmlentities($mil->titre).'"></td></tr>';
             print '<tr><td width="25%">'.$langs->trans("MailFrom").'</td><td colspan="3"><input class="flat" type="text" size=40 name="from" value="'.htmlentities($mil->email_from).'"></td></tr>';
             print '<tr><td width="25%">'.$langs->trans("MailTopic").'</td><td colspan="3"><input class="flat" type="text" size=60 name="sujet" value="'.htmlentities($mil->sujet).'"></td></tr>';
-            print '<tr><td width="25%" valign="top">'.$langs->trans("MailMessage").'</td><td colspan="3"><textarea name="body" cols=70 rows=10>';
+            print '<tr><td width="25%" valign="top">'.$langs->trans("MailMessage").'<br>';
+            print '<br><i>'.$langs->trans("CommonSubstitutions").':<br>';
+            print '__ID__ = '.$langs->trans("IdRecord").'<br>';
+            print '__EMAIL__ = '.$langs->trans("EMail").'<br>';
+            print '__LASTNAME__ = '.$langs->trans("Lastname").'<br>';
+            print '__FIRSTNAME__ = '.$langs->trans("Firstname").'<br>';
+            print '</i></td>';
+            print '<td colspan="3"><textarea name="body" cols=70 rows=10>';
             print $mil->body.'</textarea></td></tr>';
 
             print '<tr><td colspan="4" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td></tr>';
diff --git a/htdocs/includes/modules/mailings/poire.modules.php b/htdocs/includes/modules/mailings/poire.modules.php
index 0ffbb8075cd..5a0109a029d 100644
--- a/htdocs/includes/modules/mailings/poire.modules.php
+++ b/htdocs/includes/modules/mailings/poire.modules.php
@@ -54,7 +54,7 @@ include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php'
 class mailing_poire extends MailingTargets
 {
     var $name='ContactCompanies';                       // Identifiant du module mailing
-    var $desc='Contacts des sociétés';                  // Libellé utilisé si aucune traduction pour MailingModuleDescXXX ou XXX=name trouvée
+    var $desc='Contacts avec emails des sociétés';      // Libellé utilisé si aucune traduction pour MailingModuleDescXXX ou XXX=name trouvée
     var $require_module=array("commercial");            // Module mailing actif si modules require_module actifs
     var $require_admin=0;                               // Module mailing actif pour user admin ou non
     var $picto='contact';
@@ -129,7 +129,7 @@ class mailing_poire extends MailingTargets
     function add_to_target($mailing_id,$filtersarray=array())
     {
         // La requete doit retourner: id, email, fk_contact, name, firstname
-        $sql = "SELECT s.idp as id, c.email as email, c.idp as fk_contact, c.name as name, c.firstname as firstname";
+        $sql = "SELECT c.idp as id, c.email as email, c.idp as fk_contact, c.name as name, c.firstname as firstname";
         $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
         $sql .= ", ".MAIN_DB_PREFIX."societe as s";
         $sql .= " WHERE s.idp = c.fk_soc";