diff -urp /var/www/html/drupal5/sites/all/modules/user_register_notify/user_register_notify.info /var/www/html/drupal6/sites/all/modules/user_register_notify/user_register_notify.info
--- /var/www/html/drupal5/sites/all/modules/user_register_notify/user_register_notify.info	2007-01-02 19:14:54.000000000 -0500
+++ /var/www/html/drupal6/sites/all/modules/user_register_notify/user_register_notify.info	2008-03-02 21:25:35.000000000 -0500
@@ -4,6 +4,7 @@ description = Notifies administrator of 
 package = Optional
 
 ; Information added by drupal.org packaging script on 2007-01-03
-version = "5.x-1.x-dev"
+version = "6.x-1.x-dev"
 project = "user_register_notify"
-
+core = 6.x
+php = 5.2.4
diff -urp /var/www/html/drupal5/sites/all/modules/user_register_notify/user_register_notify.module /var/www/html/drupal6/sites/all/modules/user_register_notify/user_register_notify.module
--- /var/www/html/drupal5/sites/all/modules/user_register_notify/user_register_notify.module	2007-01-02 05:46:21.000000000 -0500
+++ /var/www/html/drupal6/sites/all/modules/user_register_notify/user_register_notify.module	2008-03-02 21:05:18.000000000 -0500
@@ -17,25 +17,57 @@ function user_register_notify_user($op, 
       // In case when accounts must be created with administrator's approval
       // there is already a 'pending approval' e-mail notification.
       if ($account->uid != 1 && $account->status) {
-        if (defined('VERSION') && version_compare(VERSION, '5.0 dev', '>=')) {
-          $subject = t('Account details for !username at !site', array('!username' => $account->name, '!site' => variable_get('site_name', 'Drupal')));
+        if (defined('VERSION') && version_compare(VERSION, '6.0 dev', '>=')) {
           $to = $from = variable_get('site_mail', ini_get('sendmail_from'));
-
+          $params = array('account' => $account);
+          print_r($account);
           drupal_mail(
+            'user_register_notify',
             'user-register-notify-admin',
             $to,
-            $subject,
-            t("!user (!uri) has created account.\n\n!edit-uri", array('!uri' => url("user/$account->uid", NULL, NULL, TRUE), '!user' => $account->name, '!edit-uri' => url("user/$account->uid/edit", NULL, NULL, TRUE))),
+            language_default(),
+            $params,
             $from
           );
         }
-        // Else we have Drupal 4.7.
+        // Else we have we have 5.x or 4.7
         else {
-          $subject = t('Account details for %username at %site', array('%username' => $account->name, '%site' => variable_get('site_name', 'drupal')));
-          $from = variable_get('site_mail', ini_get('sendmail_from'));
-          user_mail($from, $subject, t("%user (%uri) has created account.\n\n%edit-uri", array('%uri' => url("user/$account->uid", NULL, NULL, TRUE), '%user' => $account->name, '%edit-uri' => url("user/$account->uid/edit", NULL, NULL, TRUE))), "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+          if (defined('VERSION') && version_compare(VERSION, '5.0 dev', '>=')) {
+            $subject = t('Account details for !username at !site', array('!username' => $account->name, '!site' => variable_get('site_name', 'Drupal')));
+            $to = $from = variable_get('site_mail', ini_get('sendmail_from'));
+
+            drupal_mail(
+              'user-register-notify-admin',
+              $to,
+              $subject,
+              t("!user (!uri) has created account.\n\n!edit-uri", array('!uri' => url("user/$account->uid", NULL, NULL, TRUE), '!user' => $account->name, '!edit-uri' => url("user/$account->uid/edit", NULL, NULL, TRUE))),
+              $from
+            );
+          }
+          // Else we have Drupal 4.7.
+          else {
+            $subject = t('Account details for %username at %site', array('%username' => $account->name, '%site' => variable_get('site_name', 'drupal')));
+            $from = variable_get('site_mail', ini_get('sendmail_from'));
+            user_mail($from, $subject, t("%user (%uri) has created account.\n\n%edit-uri", array('%uri' => url("user/$account->uid", NULL, NULL, TRUE), '%user' => $account->name, '%edit-uri' => url("user/$account->uid/edit", NULL, NULL, TRUE))), "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+          }
         }
       }
       break;
   }
+
 }
+
+
+function user_register_notify_mail($key, &$message, $params) {
+
+  $language = $message['language'];
+  $langcode = $language->language;
+  $uid = $params['account']->uid;
+  $uri = url("user/$uid", array('absolute' => TRUE));
+  $uri_edit = url("user/$uid/edit", array('absolute' => TRUE));
+
+  $message['subject'] = t('Account details for !username at !site', array('!username' => $params['account']->name, '!site' => variable_get('site_name', 'Drupal')), $langcode);
+  $message['body'][] = t('!user (!uri) has created account.', array('!user' => $params['account']->name, '!uri' => $uri), $langcode);
+  $message['body'][] .= t('!uri_edit ', array('!uri_edit' => $uri_edit), $langcode);
+
+}
\ No newline at end of file