diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 79905182ee3..b300e8cc293 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -316,22 +316,15 @@ if ($object->fetch($id) >= 0) {
 	if ($allowaddtarget && $user->rights->mailing->creer) {
 		print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"), ($user->admin ?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"), 1) : ''), 'generic');
 
-		//print '<table class="noborder centpercent">';
-
 		print '<div class="div-table-responsive">';
 		print '<div class="tagtable centpercent liste_titre_bydiv borderbottom" id="tablelines">';
 
-		//print '<tr class="liste_titre">';
 		print '<div class="tagtr liste_titre">';
-		//print '<td class="liste_titre">'.$langs->trans("RecipientSelectionModules").'</td>';
+		print '<div class="tagtd"></div>';
 		print '<div class="tagtd">'.$langs->trans("RecipientSelectionModules").'</div>';
-		//print '<td class="liste_titre" align="center">'.$langs->trans("NbOfUniqueEMails").'</td>';
 		print '<div class="tagtd" align="center">'.$langs->trans("NbOfUniqueEMails").'</div>';
-		//print '<td class="liste_titre" align="left">'.$langs->trans("Filter").'</td>';
 		print '<div class="tagtd left">'.$langs->trans("Filter").'</div>';
-		//print '<td class="liste_titre" align="center">&nbsp;</td>';
 		print '<div class="tagtd">&nbsp;</div>';
-		//print "</tr>\n";
 		print '</div>';	// End tr
 
 		clearstatcache();
@@ -396,12 +389,13 @@ if ($object->fetch($id) >= 0) {
 						print '<div '.$bctag[$var].'>';
 					}
 
-					print '<div class="tagtd">';
+					print '<div class="tagtd paddingleftimp marginleftonly paddingrightimp marginrightonly valignmiddle center">';
 					if (empty($obj->picto)) {
 						$obj->picto = 'generic';
 					}
-					print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj), $obj->picto, 'class="valignmiddle pictomodule pictofixedwidth"');
-					print ' ';
+					print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj), $obj->picto, 'class="valignmiddle width25 size15x"');
+					print '</div>';
+					print '<div class="tagtd valignmiddle">';	//  style="height: 4em"
 					print $obj->getDesc();
 					print '</div>';
 
@@ -411,7 +405,7 @@ if ($object->fetch($id) >= 0) {
 						dol_syslog($e->getMessage(), LOG_ERR);
 					}
 
-					print '<div class="tagtd center">';
+					print '<div class="tagtd center valignmiddle">';
 					if ($nbofrecipient === '' || $nbofrecipient >= 0) {
 						print $nbofrecipient;
 					} else {
@@ -419,7 +413,7 @@ if ($object->fetch($id) >= 0) {
 					}
 					print '</div>';
 
-					print '<div class="tagtd left">';
+					print '<div class="tagtd left valignmiddle">';
 					if ($allowaddtarget) {
 						try {
 							$filter = $obj->formFilter();
@@ -434,7 +428,7 @@ if ($object->fetch($id) >= 0) {
 					}
 					print '</div>';
 
-					print '<div class="tagtd right">';
+					print '<div class="tagtd right valignmiddle">';
 					if ($allowaddtarget) {
 						print '<input type="submit" class="button button-add small reposition" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
 					} else {
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 289433d4dc3..fd91e5e849f 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -89,6 +89,17 @@ class mailing_thirdparties extends MailingTargets
 				$addDescription .= "Unknown status ".GETPOST("filter_client_thirdparties");
 			}
 		}
+		if (GETPOSTISSET("filter_supplier_thirdparties") && GETPOST("filter_supplier_thirdparties") <> '-1') {
+			$addFilter .= " AND s.fournisseur = ".((int) GETPOST("filter_supplier_thirdparties", 'int'));
+			$addDescription = $langs->trans('Supplier')."=";
+			if (GETPOST("filter_supplier_thirdparties") == 0) {
+				$addDescription .= $langs->trans('No');
+			} elseif (GETPOST("filter_supplier_thirdparties") == 1) {
+				$addDescription .= $langs->trans('Yes');
+			} else {
+				$addDescription .= "Unknown status ".GETPOST("filter_supplier_thirdparties");
+			}
+		}
 		if (GETPOSTISSET("filter_status")) {
 			if (strlen($addDescription) > 0) {
 				$addDescription .= ";";
@@ -97,7 +108,20 @@ class mailing_thirdparties extends MailingTargets
 			if (GETPOST("filter_status") == '1') {
 				$addFilter .= " AND s.status=1";
 				$addDescription .= $langs->trans("Enabled");
-			} else {
+			} elseif (GETPOST("filter_status") == '0') {
+				$addFilter .= " AND s.status=0";
+				$addDescription .= $langs->trans("Disabled");
+			}
+		}
+		if (GETPOSTISSET("filter_status")) {
+			if (strlen($addDescription) > 0) {
+				$addDescription .= ";";
+			}
+			$addDescription .= $langs->trans("Status")."=";
+			if (GETPOST("filter_status") == '1') {
+				$addFilter .= " AND s.status=1";
+				$addDescription .= $langs->trans("Enabled");
+			} elseif (GETPOST("filter_status") == '0') {
 				$addFilter .= " AND s.status=0";
 				$addDescription .= $langs->trans("Disabled");
 			}
@@ -295,7 +319,7 @@ class mailing_thirdparties extends MailingTargets
 		$s .= '</select> ';
 
 		// filter_client_thirdparties
-		$s .= '<select id="filter_client_thirdparties" name="filter_client_thirdparties" class="flat">';
+		$s .= '<select id="filter_client_thirdparties" name="filter_client_thirdparties" class="flat minwidth100">';
 		$s .= '<option value="-1">'.$langs->trans('ProspectCustomer').'</option>';
 		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
 			$s .= '<option value="2">'.$langs->trans('Prospect').'</option>';
@@ -311,7 +335,15 @@ class mailing_thirdparties extends MailingTargets
 		$s .= '</select> ';
 		$s .= ajax_combobox("filter_client_thirdparties");
 
-		// filter_status
+		// filter_supplier_thirdparties
+		$s .= ' <select id="filter_supplier_thirdparties" name="filter_supplier_thirdparties" class="flat minwidth100">';
+		$s .= '<option value="-1">'.$langs->trans("Supplier").'</option>';
+		$s .= '<option value="1">'.$langs->trans("Yes").'</option>';
+		$s .= '<option value="0">'.$langs->trans("No").'</option>';
+		$s .= '</select>';
+		$s .= ajax_combobox("filter_supplier_thirdparties");
+
+		// filter_status_thirdparties
 		$s .= ' <select id="filter_status_thirdparties" name="filter_status" class="flat">';
 		$s .= '<option value="-1">'.$langs->trans("Status").'</option>';
 		$s .= '<option value="1">'.$langs->trans("Enabled").'</option>';
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index f83637c9c40..4d98f0e7f49 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+MailingModuleDescThirdPartiesByCategories=Third parties
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=All filters must match to have an email being collected