diff -urNp modtars/account_reminder/account_reminder.info modules/account_reminder/account_reminder.info
--- modules/account_reminder/account_reminder.info	1970-01-01 01:00:00.000000000 +0100
+++ modules/account_reminder/account_reminder.info	2007-02-28 13:08:22.002248000 +0100
@@ -0,0 +1,3 @@
+; $Id$
+name = Account Reminder
+description = Reminds users who signed up, but have never logged in.
\ No newline at end of file
diff -urNp modtars/account_reminder/account_reminder.install modules/account_reminder/account_reminder.install
--- modules/account_reminder/account_reminder.install	2007-02-26 09:31:13.000000000 +0100
+++ modules/account_reminder/account_reminder.install	2007-02-28 13:51:05.000321000 +0100
@@ -1,4 +1,5 @@
 <?php
+// $Id$ 
 
 /**
  * Implementation of hook_install()
@@ -7,7 +8,7 @@ function account_reminder_install() {
   switch ($GLOBALS['db_type']) {
     case 'mysql':
     case 'mysqli':
-      db_query("CREATE TABLE account_reminder (
+      db_query("CREATE TABLE {account_reminder} (
                   uid INT (10) NOT NULL ,
                   last_reminder TIMESTAMP NULL ,
                   msg_cnt INT (10) NULL ,
@@ -19,3 +20,15 @@ function account_reminder_install() {
     break; 
   }
 }
+
+/**
+ * Implementation of hook_uninstall()
+ */
+function account_reminder_uninstall(){
+  db_query("DROP TABLE {account_reminder}");
+  variable_del('account_reminder_initial');
+  variable_del('account_reminder_frequency');
+  variable_del('account_reminder_total');
+  variable_del('account_reminder_subject');
+  variable_del('account_reminder_msg'); 
+}
\ No newline at end of file
diff -urNp modtars/account_reminder/account_reminder.module modules/account_reminder/account_reminder.module
--- modules/account_reminder/account_reminder.module	2007-02-26 09:40:30.000000000 +0100
+++ modules/account_reminder/account_reminder.module	2007-02-28 14:39:43.001060000 +0100
@@ -1,4 +1,6 @@
 <?php
+// $Id$
+
 /**
  * Module by Computerminds http://www.computerminds.co.uk Jan 2007
  * 
@@ -8,14 +10,6 @@
  *
  */  
 
-function account_reminder_help($section){
-  switch ($section){
-  case 'admin/modules#description':
-      return t('Reminds users who signed up, but have never logged in.');
-      break;
-  }
-}
-
 /*Delete the user from the account reminder table if the user is deleted*/
 function account_reminder_user($op, &$edit, &$user, $category = NULL) {
 
@@ -29,69 +23,80 @@ function account_reminder_user($op, &$ed
 /**
  * Implementation of hook perm
  */ 
-function account_reminder_perm(){
+function account_reminder_perm() {
   return array("administer account_reminder");
 }
 
 /**
- * For the admin/settings/account_reminder page
- */ 
-function account_reminder_settings(){
-  
-  if (!user_access('administer account_reminder')) {
-    $form['error'] = array('#type' => 'item',
-      '#title' => t('You are not authorized to access the pathauto settings.'));
-    return $form;
+* Implementation of hook_menu
+*/
+function account_reminder_menu($may_cache) {
+  if($may_cache) {
+    $items[] = array(
+      'path' => 'admin/settings/account_reminder',
+      'title' => t('Account Reminder'),
+      'description' => t('Settings of Account Reminder, sets reminder frequency and mail details'),
+      'callback' => 'drupal_get_form',
+      'callback arguments' => array('account_reminder_settings'),
+      'access' => user_access('administer site configuration'),
+    );
   }
   
-  $form['frequency']=array('#type' => 'fieldset', '#title'=> 'Reminder frequency');
-  $form['mail']=array('#type' => 'fieldset', '#title'=> 'Reminder email details');
+  return $items;  
+}
+
+/**
+ * For the admin/settings/account_reminder page
+ */
+function account_reminder_settings(){  
+  $form['frequency']=array('#type' => 'fieldset', '#title'=> t('Reminder frequency'));
+  $form['mail']=array('#type' => 'fieldset', '#title'=> t('Reminder email details'));
   $form['frequency']['account_reminder_initial']=array('#type'=>'textfield', 
-                                            '#title'=>'Days till initial reminder', 
+                                            '#title'=>t('Days till initial reminder'), 
                                             '#default_value'=>variable_get('account_reminder_initial', 10), 
-                                            '#description' => 'The time span (in days) between the user registering and the initial reminder being sent'
+                                            '#description' => t('The time span (in days) between the user registering and the initial reminder being sent')
                                             );
   $form['frequency']['account_reminder_frequency']=array('#type' => 'textfield', 
-                                            '#title' => 'Days between reminders',
+                                            '#title' => t('Days between reminders'),
                                             '#default_value' => variable_get('account_reminder_frequency', 14), 
-                                            '#description' => 'The time (in days) between subsequent reminders.'
+                                            '#description' => t('The time (in days) between subsequent reminders.')
                                             );
 
   $form['frequency']['account_reminder_total']=array('#type' => 'textfield', 
-                                            '#title' => 'Total number of reminders',
+                                            '#title' => t('Total number of reminders'),
                                             '#default_value' => variable_get('account_reminder_total', 3), 
-                                            '#description' => 'Total number of reminders to send before giving up, you can\'t win \'em all!'
+                                            '#description' => t('Total number of reminders to send before giving up, you can\'t win \'em all!')
                                             );
                                             
   $form['mail']['account_reminder_subject']=array('#type' => 'textfield', 
-                                            '#title' => 'Email subject',
-                                            '#default_value' => variable_get('account_reminder_subject', 'Account details for %username at %site'), 
-                                            '#description' => 'The subject of the message with variables %site, %username',
+                                            '#title' => t('Email subject'),
+                                            '#default_value' => variable_get('account_reminder_subject', t('Account details for !username at !site')), 
+                                            '#description' => t('The subject of the message with variables !site, !username'),
                                             '#weight'=>-10
                                             
                                             );
   $form['mail']['account_reminder_msg']=array('#type' => 'textarea', 
-                                            '#title' => 'Email body',
-                                            '#default_value' => variable_get('account_reminder_msg', '%username,
+                                            '#title' => t('Email body'),
+                                            '#default_value' => variable_get('account_reminder_msg', '!username,
 
-This is a reminder from %site. You have registered for a user account but have not yet validated your email address.  To fully activate your account at %login_uri login using the following username and password:
+This is a reminder from !site. You have registered for a user account but have not yet validated your email address.  To fully activate your account at !login_uri login using the following username and password:
 
-username: %username
-password: %password
+username: !username
+password: !password
 
 You may also log in by clicking on this link or copying and pasting it in your browser:
 
-%login_url
+!login_url
 
 This is a one-time login, so it can be used only once.
 
 
---  %site team'), 
-                                            '#description' => 'Customise the body of the email. Valid variables are %site, %username, %login_uri, %login_url (the one time login link) and %password.',
+--  !site team'), 
+                                            '#description' => t('Customise the body of the email. Valid variables are !site, !username, !login_uri, !login_url (the one time login link) and !password.'),
                                             '#weight'=>-8
                                             );
                                            
-  return $form;
+  return system_settings_form($form);
 }
 
 
@@ -101,7 +106,7 @@ This is a one-time login, so it can be u
 function account_reminder_cron(){
 
   //Remove users who have signed up from the reminder table...
-  $result=db_query("DELETE account_reminder.* FROM account_reminder,users WHERE account_reminder.uid=users.uid AND access!=0 AND users.uid!=0 AND status=1");
+  $result=db_query("DELETE {account_reminder}.* FROM {account_reminder},{users} WHERE {account_reminder}.uid={users}.uid AND access!=0 AND {users}.uid!=0 AND status=1");
 
   $first_wait=variable_get('account_reminder_initial', 10);
   $period=variable_get('account_reminder_frequency', 14);
@@ -114,13 +119,13 @@ function account_reminder_cron(){
     if(intval($row->msg_cnt)==0){
       if ($row->created + (60*60*24*$first_wait) < time()){
         account_reminder_send_email($row, 'first');
-        db_query("REPLACE INTO account_reminder SET uid=%d,msg_cnt=%d,last_reminder=NOW()",$row->uid,intval($row->msg_cnt)+1);
+        db_query("REPLACE INTO {account_reminder} SET uid=%d,msg_cnt=%d,last_reminder=NOW()",$row->uid,intval($row->msg_cnt)+1);
       }
     }
 
     elseif (intval($row->date_diff) > $period && ($row->msg_cnt<$total_messages)) {
         account_reminder_send_email($row, 'any');
-        db_query("REPLACE INTO account_reminder SET uid=%d,msg_cnt=%d,last_reminder=NOW()",$row->uid,intval($row->msg_cnt)+1);
+        db_query("REPLACE INTO {account_reminder} SET uid=%d,msg_cnt=%d,last_reminder=NOW()",$row->uid,intval($row->msg_cnt)+1);
     }
   }
 
@@ -137,43 +142,49 @@ function account_reminder_send_email($us
   user_save($user,array('pass'=>$pass));
 
   $user->pass=md5($pass);
-  
-  $variables = array('%site' => variable_get('site_name',""),
-                     '%username' => $user->name,
-                     '%password'=>$pass,
-                     '%user_mail' => $user->mail,
-                     '%login_uri'=>url('user',null,null,true),
-                     '%login_url' => user_pass_reset_url($user)
+  $variables = array('!site' => variable_get('site_name','Drupa'),
+                     '!username' => $user->name,
+                     '!password'=>$pass,
+                     '!user_mail' => $user->mail,
+                     '!login_uri'=>url('user',null,null,true),
+                     '!login_url' => user_pass_reset_url($user)
                     );
                        
   $from=variable_get('site_mail', 'admin@example.com');
     
-  $subject = t(variable_get('account_reminder_subject', 'Account details for %username at %site'),$variables);
-  $body = t(variable_get('account_reminder_msg', "%username,
+  
+  if ($admin_setting = variable_get('account_reminder_subject', FALSE)) {
+    $subject = strtr($admin_setting, $variables);
+  } else {
+    $subject = t('Account details for !username at !site',$variables);
+  }
+  
+  if ($admin_setting = variable_get('account_reminder_msg', FALSE)) {
+    $body = strtr($admin_setting, $variables);
+  } else {
+    $body = t("!username,  
 
-This is a reminder from %site. You have registered for a user account but have not yet validated your email address.  To fully activate your account at %login_uri login using the following username and password:
+This is a reminder from !site. You have registered for a user account but have not yet validated your email address.  To fully activate your account at !login_uri login using the following username and password:
 
-username: %username
-password: %password
+username: !username
+password: !password
 
 You may also log in by clicking on this link or copying and pasting it in your browser:
 
-%login_url
+!login_url
 
 This is a one-time login, so it can be used only once.
 
 
---  %site team"), $variables);
-  
-  $headers = "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from";
+--  !site team", $variables);
+  }
 
   $email = str_replace(array("\r\n", "\n", "\r", ";", ","), '', $user->mail);
   
   if(valid_email_address($email)){
-    module_invoke_all('account_reminder_email', $email, $subject, $body, $headers);
-    user_mail($email, $subject, $body, $headers);
-    watchdog("account_reminder", "Reminder email send to user " . $user->name);
+    module_invoke_all('account_reminder_email', $email, $subject, $body, $from);
+    drupal_mail("account_reminder_send_mail",$email, $subject, $body, $from);
+    watchdog("account_reminder", t("Reminder email send to %user at %email.", array('%user' => $user->name, '%email' => $user->mail ) ));
   }
 }
 
-?>