diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 175bc8873e1..159708de61f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5948,7 +5948,7 @@ class Form
                         {
                             console.log("We uncheck all");
                     		$(".'.$cssclass.'").prop(\'checked\', false);
-                        }';
+                        }'."\n";
         if ($calljsfunction) $out.='if (typeof initCheckForSelect == \'function\') { initCheckForSelect(); } else { console.log("No function initCheckForSelect found. Call won\'t done."); }';
         $out.='         });
                 });
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 23b0fc5d6e2..a0afc8bcc94 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -715,9 +715,11 @@ class FormMail extends Form
         		$out.= "</td></tr>\n";
         	}
 
+        	$out.= '</table>'."\n";
+
         	if ($this->withform == 1 || $this->withform == -1)
         	{
-        		$out.= '<tr><td align="center" colspan="2"><div class="center">';
+        		$out.= '<br><div class="center">';
         		$out.= '<input class="button" type="submit" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
         		// Add a javascript test to avoid to forget to submit file before sending email
         		if ($this->withfile == 2 && $conf->use_javascript_ajax)
@@ -730,11 +732,9 @@ class FormMail extends Form
         			$out.= ' &nbsp; &nbsp; ';
         			$out.= '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
         		}
-        		$out.= '</div></td></tr>'."\n";
+        		$out.= '</div>'."\n";
         	}
 
-        	$out.= '</table>'."\n";
-
         	if ($this->withform == 1) $out.= '</form>'."\n";
 
         	// Disable enter key if option MAIN_MAILFORM_DISABLE_ENTERKEY is set