diff -uP ../inactive_user_patched/inactive_user.install inactive_user/inactive_user.install
--- ../inactive_user_patched/inactive_user.install	2009-05-28 16:31:06.829843104 -0500
+++ inactive_user/inactive_user.install	2008-05-19 11:21:27.000000000 -0500
@@ -10,9 +10,6 @@
     case 'mysqli':
       db_query("CREATE TABLE {inactive_users} (
         uid int(1) unsigned NOT NULL default '0',
-        never_returned INT( 1 ) unsigned NOT NULL DEFAULT '0',
-        notified_never_return_user INT( 1 ) UNSIGNED NOT NULL DEFAULT '0',
-        notified_never_return_admin INT( 1 ) UNSIGNED NOT NULL DEFAULT '0',
         notified_admin int(1) unsigned NOT NULL default '0',
         notified_user int(1) unsigned NOT NULL default '0',
         warned_user_block_timestamp int(11) unsigned NOT NULL default '0',
@@ -53,10 +50,6 @@
   variable_del('inactive_user_block_warn_text');
   variable_del('inactive_user_delete_notify_text');
   variable_del('inactive_user_delete_warn_text');
-  variable_del('inactive_user_never_returned_grace_period');
-  variable_del('inactive_user_never_returned_notify_admin');
-  variable_del('inactive_user_never_returned_user_notify');
-  variable_del('inactive_user_never_returned_user_notify_text');
   variable_del('inactive_user_notify');
   variable_del('inactive_user_notify_admin');
   variable_del('inactive_user_notify_block');
@@ -67,20 +60,3 @@
   variable_del('inactive_user_preserve_content');
   variable_del('inactive_user_timestamp');
 }
-
-/**
- * Add fields never_returned, notified_never_return_user, notified_never_return_admin to manage users who never used their accounts
- */
-function inactive_user_update_1() {
-  switch ($GLOBALS['db_type']) {
-    case 'mysql':
-    case 'mysqli':
-      $ret[] = update_sql("ALTER TABLE {inactive_users} 
-         ADD never_returned INT( 1 ) UNSIGNED NOT NULL DEFAULT '0' AFTER uid,
-         ADD notified_never_return_user INT( 1 ) UNSIGNED NOT NULL DEFAULT '0' AFTER never_returned,
-         ADD notified_never_return_admin INT( 1 ) UNSIGNED NOT NULL DEFAULT '0' AFTER notified_never_return_user;");
-         
-       return $ret;
-    break;
-  }
-}
\ No newline at end of file
diff -uP ../inactive_user_patched/inactive_user.module inactive_user/inactive_user.module
--- ../inactive_user_patched/inactive_user.module	2009-05-28 16:31:06.829843104 -0500
+++ inactive_user/inactive_user.module	2008-06-09 11:04:31.000000000 -0500
@@ -45,9 +45,7 @@
   if (user_access('change inactive user settings')) {
     $period = array(0 => 'disabled') + drupal_map_assoc(array(604800, 1209600, 1814400, 2419200, 2592000, 7776000, 15552000, 23328000, 31536000, 47088000, 63072000), '_format_interval');
     $warn_period = array(0 => 'disabled') + drupal_map_assoc(array(86400, 172800, 259200, 604800, 1209600, 1814400, 2592000), '_format_interval');
-    $grace_period = $period;	//for never-returned users
-    unset ( $grace_period[0] );		// assures that users newer than 1 week will never be notified
-    $mail_variables = ' %username, %useremail, %lastaccess, %period, @sitename, %siteurl';
+    $mail_variables = ' %username, %useremail, %lastaccess, %period, %sitename, %siteurl';
 
     // set administrator e-mail
     $form['inactive_user_admin_email_fieldset'] = array(
@@ -65,49 +63,6 @@
       '#required' => TRUE,
     );
 
-    // notification of never-returned user
-    $form['inactive_user_never_returned_notification'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Never-returned user notification'),
-      '#collapsible' => TRUE,
-      '#collapsed' => FALSE,
-    );
-    $form['inactive_user_never_returned_notification']['inactive_user_never_returned_notify_admin'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Notify administrator when a user has never logged in.'),
-      '#default_value' => variable_get('inactive_user_never_returned_notify_admin', 0),
-      '#description' => t('Generate an email to notify the site administrator that a user account has never been used after registration.  Requires crontab.'),
-    );
-    $form['inactive_user_never_returned_notification']['inactive_user_never_returned_user_notify'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Notify users when they have never logged in.'),
-      '#default_value' => variable_get('inactive_user_never_returned_user_notify', 0),
-      '#description' => t('Generate an email to notify users when they have never used their account after registration.  Requires crontab.'),
-    );
-    $form['inactive_user_never_returned_notification']['inactive_user_never_returned_grace_period'] = array(
-      '#type' => 'select',
-      '#title' => t('Don\'t notify about users newer than'),
-      '#default_value' => variable_get('inactive_user_never_returned_grace_period', 604800),
-      '#options' => $grace_period,
-      '#description' => t('Allows notification of users whose accounts have been created before the set time. Defaults to one week. Setting this period to zero is not allowed, to avoid notification of newly created users. Requires crontab.'),
-    );
-    $form['inactive_user_never_returned_notification']['inactive_user_never_returned_user_notify_text'] = array(
-      '#type' => 'textarea',
-      '#title' => t('Body of user notification e-mail'),
-      '#default_value' => variable_get('inactive_user_never_returned_user_notify_text', _inactive_user_mail_text('never_returned_notify_text')),
-      '#cols' => 70,
-      '#rows' => 10,
-      '#description' => t('Customize the body of the notification e-mail sent to the user.') . ' ' . t('Available variables are:') . $mail_variables,
-      '#required' => TRUE,
-    );
-    $form['inactive_user_never_returned_notification']['never_logged_in_user_auto_delete'] = array(
-      '#type' => 'select',
-      '#title' => t('Delete users that have never returned, and the account is older than'),
-      '#default_value' => variable_get('never_logged_in_user_auto_delete', 0),
-      '#options' => $period,
-      '#description' => t('Automatically delete user accounts that have never logged in, and account was created longer than the specified time.  Warning, user accounts are permanently deleted, with no ability to undo the action!  Requires crontab.'),
-    );
-        
     // inactive user notification
     $form['inactive_user_notification'] = array(
       '#type' => 'fieldset',
@@ -289,44 +244,9 @@
       }
     }
 
-    // notify administrator of never-returned user accounts (doesn't send e-mails for a week after registration)
-    if ( variable_get('inactive_user_never_returned_notify_admin', 0) && $grace_time = variable_get('inactive_user_never_returned_grace_period', 604800) ) {
-      $result = db_query('SELECT uid, name, mail, access, login, created FROM {users} WHERE ( access = 0 or login = 0 ) && NOT (uid=1) and created < %d ORDER BY uid ASC', time() - $grace_time);
-      while ($user = db_fetch_object($result)) {
-        if ($user->uid && !db_fetch_object(db_query('SELECT uid FROM {inactive_users} WHERE uid = %d AND notified_never_return_admin = 1 and never_returned = 1', $user->uid)) ) {
-          db_query('UPDATE {inactive_users} SET notified_never_return_admin = 1, never_returned = 1 WHERE uid = %d', $user->uid);
-          if (!db_affected_rows()) {
-            // must create a new row
-            @db_query('INSERT INTO {inactive_users} (uid, notified_never_return_admin, never_returned) VALUES(%d, 1, 1)', $user->uid);
-          }
-          $user_list .= "$user->uid $user->name ($user->mail)\n";
-        }
-      }
-      if ($user_list) {
-        _inactive_user_mail(t('[@sitename] Never-returned users', array('@sitename' => variable_get('site_name', 'drupal'))), _inactive_user_mail_text('never_returned_notify_admin_text'), $notify_time, NULL, $user_list);
-        unset($user_list);
-      }
-    }
-
-    // notify users that their account has never been used (doesn't send e-mails for a week after registration)
-    if ( variable_get('inactive_user_never_returned_user_notify', 0) && $grace_time = variable_get('inactive_user_never_returned_grace_period', 604800) ) {
-      $result = db_query('SELECT uid, name, mail, access, login, created FROM {users} WHERE ( access = 0 or login = 0 ) AND status != 0 AND NOT (uid=1)  and created < %d', time() - $grace_time);
-      while ($user = db_fetch_object($result)) {
-        if ($user->uid && !db_fetch_object(db_query('SELECT uid FROM {inactive_users} WHERE notified_never_return_user = 1 and never_returned = 1 AND uid = %d', $user->uid)) ) {
-          db_query('UPDATE {inactive_users} SET notified_never_return_user = 1, never_returned = 1 WHERE uid = %d', $user->uid);
-          if (!db_affected_rows()) {
-            @db_query('INSERT INTO {inactive_users} (uid, notified_never_return_user, never_returned) VALUES(%d, 1, 1)', $user->uid);
-          }
-          _inactive_user_mail(t('[@sitename] Never-used account', array('@sitename' => variable_get('site_name', 'drupal'))), variable_get('inactive_user_never_returned_user_notify_text', _inactive_user_mail_text('never_returned_notify_text')), $notify_time, $user, NULL);
-          watchdog('user', t('user %user notified of never-used account', array('%user' => $user->name)), WATCHDOG_NOTICE, l(t('edit user'), "admin/user/edit/$uid"));
-        }
-      }
-    }
-       
     // notify administrator of inactive user accounts
     if ($notify_time = variable_get('inactive_user_notify_admin', 0)) {
-      #$result = db_query('SELECT uid, name, mail, access, created FROM {users} WHERE access < (%d - %d) AND uid <> 1', time(), $notify_time);
-      $result = db_query('SELECT uid, name, mail, access, created FROM {users} WHERE access < (%d - %d) AND access != 0 and login != 0 AND status != 0 && NOT (uid=1)', time(), $notify_time);
+      $result = db_query('SELECT uid, name, mail, access, created FROM {users} WHERE access < (%d - %d) AND uid <> 1', time(), $notify_time);
       while ($user = db_fetch_object($result)) {
         if ($user->uid && !db_fetch_object(db_query('SELECT uid FROM {inactive_users} WHERE uid = %d AND notified_admin = 1', $user->uid)) && ($user->created < (time() - $notify_time))) {
           db_query('UPDATE {inactive_users} SET notified_admin = 1 WHERE uid = %d', $user->uid);
@@ -345,8 +265,7 @@
 
     // notify users that their account has been inactive
     if ($notify_time = variable_get('inactive_user_notify', 0)) {
-      #$result = db_query('SELECT * FROM {users} WHERE access < (%d - %d) AND status <> 0 AND uid <> 1', time(), $notify_time);
-      $result = db_query('SELECT * FROM {users} WHERE access < (%d - %d) AND access != 0 and login != 0 AND status != 0 AND NOT (uid=1)', time(), $notify_time);
+      $result = db_query('SELECT * FROM {users} WHERE access < (%d - %d) AND status <> 0 AND uid <> 1', time(), $notify_time);
       while ($user = db_fetch_object($result)) {
         if ($user->uid && !db_fetch_object(db_query('SELECT uid FROM {inactive_users} WHERE notified_user = 1 AND uid = %d', $user->uid)) && ($user->created < (time() - $notify_time))) {
           db_query('UPDATE {inactive_users} SET notified_user = 1 WHERE uid = %d', $user->uid);
@@ -470,21 +389,6 @@
         unset($user_list);
       }
     }
-    
-    // automatically delete never logged in users
-    if ($delete_time = variable_get('never_logged_in_user_auto_delete', 0)) {
-      $result = db_query('SELECT * FROM {users} WHERE access = 0 AND ((%d - created ) > %d) AND NOT (uid=1)', time(), $delete_time);
-      while ($user = db_fetch_object($result)) 
-      	{
-            // delete the user
-            $array = (array) $user;
-            db_query("DELETE FROM {users} WHERE uid = %d", $user->uid);
-            db_query("DELETE FROM {authmap} WHERE uid = %d", $user->uid);
-            module_invoke_all('user', 'delete', $array, $user);
-            watchdog('user', t('user %user deleted due to never having logged int', array('%user' => $user->name)));
-        }
-    }
-      
   }
 }
 
@@ -538,8 +442,7 @@
     );
     $recipients = explode(',', $to);
     foreach ($recipients as $recipient) {
-      #drupal_mail('inactive_user_email', trim($recipient), $subject, wordwrap(strtr($message, $variables), 80), $from, $headers);
-      drupal_mail('inactive_user_email', 'alejandro.garza@itesm.mx', $subject, wordwrap(strtr($message, $variables), 80), $from, $headers);
+      drupal_mail('inactive_user_email', trim($recipient), $subject, wordwrap(strtr($message, $variables), 80), $from, $headers);
     }
   }
 }
@@ -549,12 +452,6 @@
  */
 function _inactive_user_mail_text($message) {
   switch ($message) {
-    case 'never_returned_notify_text':
-      return t("Hello %username,\n\n  We haven't seen you at @sitename since you first registered. Please come back and activate your account soon at %siteurl.\n\nSincerely,\n  @sitename team");
-      break;
-    case 'never_returned_notify_admin_text':
-      return t("Hello,\n\n  This automatic notification is to inform you that the following users have never been seen on @sitename since they first registered:\n\n%userlist");
-      break;    
     case 'notify_text':
       return t("Hello %username,\n\n  We haven't seen you at %sitename since %lastaccess, and we miss you!  Please come back and visit us soon at %siteurl.\n\nSincerely,\n  %sitename team");
       break;