Index: modules/contact/contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.module,v
retrieving revision 1.134
diff -u -p -r1.134 contact.module
--- modules/contact/contact.module	11 Oct 2009 18:34:10 -0000	1.134
+++ modules/contact/contact.module	12 Oct 2009 16:52:50 -0000
@@ -200,7 +200,13 @@ function contact_mail($key, &$message, $
       $message['subject'] .= t('[!site-name] !subject', $variables, array('langcode' => $language->language));
       $message['body'][] = t('!recipient-name,', $variables, array('langcode' => $language->language));
       $message['body'][] = t("!sender-name (!sender-url) has sent you a message via your contact form (!form-url) at !site-name.", $variables, array('langcode' => $language->language));
-      $message['body'][] = t("If you don't want to receive such e-mails, you can change your settings at !recipient-edit-url.", $variables, array('langcode' => $language->language));
+      if ($key == 'user_mail' && !user_access('administer users', $params['user'])) {
+        // Only include the opt-out line in the original e-mail and not in the
+        // copy to the sender. Also exclude this if the e-mail was sent from
+        // a user administrator because they can always send e-mails even if
+        // the contacted user has their contact form disabled.
+        $message['body'][] = t("If you don't want to receive such e-mails, you can change your settings at !recipient-edit-url.", $variables, array('langcode' => $language->language));
+      }
       $message['body'][] = t('Message:', array(), array('langcode' => $language->language));
       $message['body'][] = $params['message'];
       break;