Index: modules/contact/contact.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.install,v
retrieving revision 1.18
diff -u -p -r1.18 contact.install
--- modules/contact/contact.install	9 Oct 2009 02:34:07 -0000	1.18
+++ modules/contact/contact.install	9 Oct 2009 02:38:05 -0000
@@ -66,6 +66,21 @@ function contact_schema() {
 }
 
 /**
+ * Implement hook_install().
+ */
+function contact_install() {
+  // Insert a default contact category.
+  db_insert('contact')
+    ->fields(array(
+      'category' => 'Website feedback',
+      'recipients' => variable_get('site_mail', ini_get('sendmail_from')),
+      'selected' => 1,
+      'reply' => '',
+    ))
+    ->execute();
+}
+
+/**
  * Implement hook_uninstall().
  */
 function contact_uninstall() {
Index: modules/contact/contact.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.test,v
retrieving revision 1.34
diff -u -p -r1.34 contact.test
--- modules/contact/contact.test	9 Oct 2009 02:34:07 -0000	1.34
+++ modules/contact/contact.test	9 Oct 2009 02:38:05 -0000
@@ -169,7 +169,7 @@ class ContactSitewideTestCase extends Dr
     // Test the auto-reply for category 'foo'.
     $email = $this->randomName(32) . '@example.com';
     $subject = $this->randomString(64);
-    $this->submitContact($this->randomName(16), $email, $subject, 1, $this->randomString(128));
+    $this->submitContact($this->randomName(16), $email, $subject, 2, $this->randomString(128));
 
     // We are testing the auto-reply, so there should be one e-mail going to the sender.
     $captured_emails = $this->drupalGetMails(array('id' => 'contact_page_autoreply', 'to' => $email, 'from' => 'foo@example.com'));
@@ -178,7 +178,7 @@ class ContactSitewideTestCase extends Dr
 
     // Test the auto-reply for category 'bar'.
     $email = $this->randomName(32) . '@example.com';
-    $this->submitContact($this->randomName(16), $email, $this->randomString(64), 2, $this->randomString(128));
+    $this->submitContact($this->randomName(16), $email, $this->randomString(64), 3, $this->randomString(128));
 
     // Auto-reply for category 'bar' should result in one auto-reply e-mail to the sender.
     $captured_emails = $this->drupalGetMails(array('id' => 'contact_page_autoreply', 'to' => $email, 'from' => 'bar@example.com'));
@@ -187,7 +187,7 @@ class ContactSitewideTestCase extends Dr
 
     // Verify that no auto-reply is sent when the auto-reply field is left blank.
     $email = $this->randomName(32) . '@example.com';
-    $this->submitContact($this->randomName(16), $email, $this->randomString(64), 3, $this->randomString(128));
+    $this->submitContact($this->randomName(16), $email, $this->randomString(64), 4, $this->randomString(128));
     $captured_emails = $this->drupalGetMails(array('id' => 'contact_page_autoreply', 'to' => $email, 'from' => 'no_autoreply@example.com'));
     $this->assertEqual(count($captured_emails), 0, t('No auto-reply e-mail was sent to the sender for category "no-autoreply".'), t('Contact'));
   }