diff -urNp util/utilities/disable_mail/disable_mail.inc util_new/utilities/disable_mail/disable_mail.inc
--- util/utilities/disable_mail/disable_mail.inc	1969-12-31 18:00:00.000000000 -0600
+++ util_new/utilities/disable_mail/disable_mail.inc	2007-05-06 23:47:55.000000000 -0500
@@ -0,0 +1,80 @@
+<?php
+//$Id: disable_mail.inc,v 1.0 2007/05/06 TexasNomad Exp $
+
+/*
+ * Implementation of hook_util.  Disables hook_mail function sitewide
+ */
+function disable_mail_util($case)
+{
+  switch($case)
+  {
+    case 'settings form':
+      $form = array();
+      $form['util_disable_mail'] = array(
+      	'#type' => 'checkbox',
+        '#title' => t('Disable mail functions sitewide'),
+        '#default_value' => variable_get('util_disable_mail', '')
+      );
+      return $form;
+      break;
+    case 'hook registry':
+      return array('disable_mail');
+      break;
+  }
+}
+/*
+ * Theme function for admin/build/modules
+ */
+function theme_system_modules_util_disable_mail_form($form)
+{
+  if (isset($form['confirm'])) {
+    return drupal_render($form);
+  }
+
+  // Individual table headers.
+  $header = array(t('Enabled'));
+  if (module_exists('throttle')) {
+    $header[] = t('Throttle');
+  }
+  $header[] = t('Name');
+  $header[] = t('Version');
+  $header[] = t('Description');
+
+  // Pull package information from module list and start grouping modules.
+  $modules = $form['validation_modules']['#value'];
+  foreach ($modules as $module) {
+    if (!isset($module->info['package']) || !$module->info['package']) {
+      $module->info['package'] = t('Other');
+    }
+    $packages[$module->info['package']][$module->name] = $module->info;
+  }
+  ksort($packages);
+
+  // Display packages.
+  $output = '';
+  foreach ($packages as $package => $modules) {
+    $rows = array();
+    foreach ($modules as $key => $module) {
+      $row = array();
+      $row[] = array('data' => drupal_render($form['status'][$key]), 'align' => 'center');
+
+      if (module_exists('throttle')) {
+        $row[] = array('data' => drupal_render($form['throttle'][$key]), 'align' => 'center');
+      }
+      $row[] = '<strong>'. drupal_render($form['name'][$key]) .'</strong>';
+      $row[] = drupal_render($form['version'][$key]);
+      $row[] = array('data' => drupal_render($form['description'][$key]), 'class' => 'description');
+      $rows[] = $row;
+    }
+    $fieldset = array(
+      '#title' => t($package),
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE, //This is the only line that was changed
+      '#value' => theme('table', $header, $rows, array('class' => 'package')),
+    );
+    $output .= theme('fieldset', $fieldset);
+  }
+
+  $output .= drupal_render($form);
+  return $output;
+}
\ No newline at end of file
diff -urNp util/utilities/system_modules/system_modules.inc util_new/utilities/system_modules/system_modules.inc
--- util/utilities/system_modules/system_modules.inc	2007-03-19 23:01:29.000000000 -0500
+++ util_new/utilities/system_modules/system_modules.inc	2007-05-06 22:11:50.000000000 -0500
@@ -13,7 +13,7 @@ function system_modules_util($case)
       $form['util_system_collapse'] = array(
       	'#type' => 'checkbox',
         '#title' => t('Collapse all fieldsets on the module enabling page'),
-        '#default_value' => variable_get('system_collapse', 1)
+        '#default_value' => variable_get('util_system_collapse', 1)
       );
       return $form;
       break;
diff -urNp util/utilities/watchdogmail/watchdog_mail.inc util_new/utilities/watchdogmail/watchdog_mail.inc
--- util/utilities/watchdogmail/watchdog_mail.inc	1969-12-31 18:00:00.000000000 -0600
+++ util_new/utilities/watchdogmail/watchdog_mail.inc	2007-05-06 22:07:38.000000000 -0500
@@ -0,0 +1,88 @@
+<?php
+//$Id: watchdog_mail.inc,v 1.0 2007/05/06 TexasNomad Exp $
+
+/*
+ * Implementation of hook_util.  Routes email to watchdog log
+ */
+function watchdog_mail_util($case)
+{
+  switch($case)
+  {
+    case 'settings form':
+      $form = array();
+      $form['util_watchdog_mail'] = array(
+      	'#type' => 'checkbox',
+        '#title' => t('Send Emails to Watchdog log'),
+        '#default_value' => variable_get('util_watchdog_mail', 1)
+      );
+      return $form;
+      break;
+    case 'hook registry':
+      return array('watchdog_mail');
+      break;
+  }
+}
+/*
+ * Implementation of hook_mail_alter
+ */
+function watchdog_mail_util_mail_alter(&$mailkey, &$to, &$subject, &$body, &$from, &$headers)
+{
+  $watchdog_mail_args = func_get_args();
+  watchdog('mail', print_r($watchdog_mail_args, 1), WATCHDOG_NOTICE);
+}
+/*
+ * Theme function for admin/build/modules
+ */
+function theme_system_modules_util_watchdog_mail_form($form)
+{
+  if (isset($form['confirm'])) {
+    return drupal_render($form);
+  }
+
+  // Individual table headers.
+  $header = array(t('Enabled'));
+  if (module_exists('throttle')) {
+    $header[] = t('Throttle');
+  }
+  $header[] = t('Name');
+  $header[] = t('Version');
+  $header[] = t('Description');
+
+  // Pull package information from module list and start grouping modules.
+  $modules = $form['validation_modules']['#value'];
+  foreach ($modules as $module) {
+    if (!isset($module->info['package']) || !$module->info['package']) {
+      $module->info['package'] = t('Other');
+    }
+    $packages[$module->info['package']][$module->name] = $module->info;
+  }
+  ksort($packages);
+
+  // Display packages.
+  $output = '';
+  foreach ($packages as $package => $modules) {
+    $rows = array();
+    foreach ($modules as $key => $module) {
+      $row = array();
+      $row[] = array('data' => drupal_render($form['status'][$key]), 'align' => 'center');
+
+      if (module_exists('throttle')) {
+        $row[] = array('data' => drupal_render($form['throttle'][$key]), 'align' => 'center');
+      }
+      $row[] = '<strong>'. drupal_render($form['name'][$key]) .'</strong>';
+      $row[] = drupal_render($form['version'][$key]);
+      $row[] = array('data' => drupal_render($form['description'][$key]), 'class' => 'description');
+      $rows[] = $row;
+    }
+    $fieldset = array(
+      '#title' => t($package),
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE, //This is the only line that was changed
+      '#value' => theme('table', $header, $rows, array('class' => 'package')),
+    );
+    $output .= theme('fieldset', $fieldset);
+  }
+
+  $output .= drupal_render($form);
+  return $output;
+}
\ No newline at end of file
diff -urNp util/util.module util_new/util.module
--- util/util.module	2007-03-19 22:54:05.000000000 -0500
+++ util_new/util.module	2007-05-07 00:07:24.000000000 -0500
@@ -16,7 +16,7 @@ function util_menu($may_cache)
   	'access' => user_access('administer util'),
   	'type' => MENU_NORMAL_ITEM,
   );
-  
+
   if(!$may_cache)
   {
     util_run_utilities();
@@ -46,7 +46,7 @@ function util_run_utilities() {
   foreach ($hooks as $hook)
   {
 	$call = '';
-    foreach($hook_files as $file => $hook_file) { 
+    foreach($hook_files as $file => $hook_file) {
       foreach ($hook_file as $hook) {
         if(function_exists($file .'_util_'. $hook)) {
           $call .= 'call_user_func_array(\''.$file .'_util_'. $hook .'\', $args);';
@@ -65,6 +65,12 @@ function util_run_utilities() {
 
 function util_settings()
 {
+  if (variable_get('util_disable_mail','') == 1) {
+    variable_set('smtp_library', drupal_get_path('module','util') . '/util.module');
+  } else {
+    variable_del('smtp_library');
+  }
+
   global $hook_files;
   $form = array();
   foreach($hook_files as $file => $blank)
@@ -80,10 +86,28 @@ function util_settings()
 function util_form_alter($form_id, &$form) {
 	system_modules_util_form_alter($form_id, &$form);
 }
-
+/**
+ * Implementation of hook_mail_alter().
+ */
+function util_mail_alter(&$mailkey, &$to, &$subject, &$body, &$from, &$headers) {
+  if (variable_get('util_watchdog_mail','') == 1) {
+    watchdog_mail_util_mail_alter(&$mailkey, &$to, &$subject, &$body, &$from, &$headers);
+  }
+  /*
+  if (variable_get('util_disable_mail','') == 1) {
+    variable_set('smtp_library', drupal_get_path('module','util') . '/util.module');
+  } else {
+    variable_set('smtp_library','');
+  }
+  */
+}
 /**
  * Implementation of hook_perm().
  */
 function util_perm() {
 	return array('administer util');
 }
+
+function drupal_mail_wrapper($mailkey,$to,$subject,$body,$from,$header) {
+  return;
+}