diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 40496ee7fa9..ddffc9f2bcd 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -689,9 +689,9 @@ class FormMail extends Form
 				$out .= '<tr><td class="minwidth200">';
 				$out .= $langs->trans("GroupEmails");
 				$out .= '</td><td>';
-				$out .= ' <input type="checkbox" name="oneemailperrecipient"'.($this->withoptiononeemailperrecipient > 0 ? ' checked="checked"' : '').'> ';
-				$out .= $langs->trans("OneEmailPerRecipient");
-				$out .= '<span class="hideonsmartphone">';
+				$out .= ' <input type="checkbox" id="oneemailperrecipient" name="oneemailperrecipient"'.($this->withoptiononeemailperrecipient > 0 ? ' checked="checked"' : '').'> ';
+				$out .= '<label for="oneemailperrecipient">'.$langs->trans("OneEmailPerRecipient").'</label>';
+				$out .= '<span class="hideonsmartphone opacitymedium">';
 				$out .= ' - ';
 				$out .= $langs->trans("WarningIfYouCheckOneRecipientPerEmail");
 				$out .= '</span>';
@@ -771,12 +771,11 @@ class FormMail extends Form
 
 				if (!empty($this->withmaindocfile)) {
 					if ($this->withmaindocfile == 1) {
-						$out .= '<input type="checkbox" name="addmaindocfile" value="1" />';
+						$out .= '<input type="checkbox" id="addmaindocfile" name="addmaindocfile" value="1" />';
+					} elseif ($this->withmaindocfile == -1) {
+						$out .= '<input type="checkbox" id="addmaindocfile" name="addmaindocfile" value="1" checked="checked" />';
 					}
-					if ($this->withmaindocfile == -1) {
-						$out .= '<input type="checkbox" name="addmaindocfile" value="1" checked="checked" />';
-					}
-					$out .= ' '.$langs->trans("JoinMainDoc").'.<br>';
+					$out .= ' <label for="id="addmaindocfile">'.$langs->trans("JoinMainDoc").'.</label><br>';
 				}
 
 				if (is_numeric($this->withfile)) {
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 91fc11ac217..dc0a9d4bb8c 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -151,7 +151,7 @@ if ($massaction == 'presend') {
 	// $formmail->withfile = 2; Not yet supported in mass action
 	$formmail->withmaindocfile = 1; // Add a checkbox "Attach also main document"
 	if ($objecttmp->element != 'societe') {
-		$formmail->withfile = '<span class="hideonsmartphone">'.$langs->trans("OnlyPDFattachmentSupported").'</span>';
+		$formmail->withfile = '<span class="hideonsmartphone opacitymedium">'.$langs->trans("OnlyPDFattachmentSupported").'</span>';
 		$formmail->withmaindocfile = - 1; // Add a checkbox "Attach also main document" but not checked by default
 	}
 	$formmail->withbody = 1;