Merge remote-tracking branch 'origin/4.0' into develop

htdocs/contact/card.php

@@ -904,7 +904,7 @@ else
 
             // Statut
             print '<tr><td>'.$langs->trans("Status").'</td>';
-            print '<td>';
+            print '<td colspan="3">';
             print $object->getLibStatut(4);
             print '</td></tr>';
 

htdocs/core/class/hookmanager.class.php

@@ -142,7 +142,8 @@ class HookManager
 				'formObjectOptions',
 				'formattachOptions',
 				'formBuilddocLineOptions',
-				'getIdProfUrl',
+			    'getFormMail',
+			    'getIdProfUrl',
 				'moveUploadedFile',
 			    'pdf_build_address',
 				'pdf_writelinedesc',