diff -ruN old/mail.module new/mail.module
--- old/mail.module	2004-09-06 09:00:49.000000000 +0100
+++ new/mail.module	2004-10-23 15:34:27.967624424 +0100
@@ -126,7 +126,7 @@
 
   $output .= form_textarea(t("Message"), "body", $node->body, 60, 15, ($error["body"] ? theme('error', $error["body"]) : ''). t('This will be the body of your email message.')  . ' ' . t('Available variables are:') . ' %username, %site, %password, %uri, %uri_brief, %mailto, %login_uri, %edit_uri.');
 
-  $output .= _mail_form_checkboxes(t('Roles'), 'roles', array_keys($node->roles), user_roles(1), t('Select roles to send the email to.'), NULL, TRUE);
+  $output .= _mail_form_checkboxes(t('Roles'), 'roles', $node->roles, user_roles(1), t('Select roles to send the email to.'), NULL, TRUE);
 
   return $output;
 }