diff --git a/bureau/admin/mail_list.php b/bureau/admin/mail_list.php
index 03499bc3..64ae4939 100755
--- a/bureau/admin/mail_list.php
+++ b/bureau/admin/mail_list.php
@@ -59,7 +59,7 @@ if ($domain=$dom->get_domain_byid($domain_id)) {
   echo '<h3>'._("Manage Catch-all")."</h3>";
 }
 
-echo $msg->msg_html_all();
+echo $msg->msg_html_all("<li>", true, true);
 ?>
     </td>
   </tr>
@@ -85,9 +85,8 @@ echo $msg->msg_html_all();
 <h3><?php printf(_("Email addresses of the domain %s"),$domain); ?> : </h3>
 <?php
 if (empty($allmails_list) && empty($search)) {
-  echo "<p><i>";
-  __("No mails for this domain.");
-  echo "</i></p><br/>";
+  $msg->raise('Error', 'mail', _("No mails for this domain."));
+  echo $msg->msg_html_all();
 } else {
 
 ?>
diff --git a/bureau/class/m_mail.php b/bureau/class/m_mail.php
index 333b63f2..667241b9 100644
--- a/bureau/class/m_mail.php
+++ b/bureau/class/m_mail.php
@@ -465,7 +465,7 @@ ORDER BY
      * OR when the DOMAIN class tells us we don't host the emails of this domain anymore.
      * @param $dom the ID of the domain to delete
      * @return boolean if the email has been properly deleted
-     * or false if an error occured ($err is filled accordingly)
+     * or false if an error occured ($msg is filled accordingly)
      */
     function hook_dom_del_mx_domain($dom_id) {
         global $db;