Index: project/project.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project/project.inc,v
retrieving revision 1.118
diff -u -p -r1.118 project.inc
--- project/project.inc	14 Oct 2007 18:34:50 -0000	1.118
+++ project/project.inc	5 Nov 2007 15:57:49 -0000
@@ -103,9 +103,6 @@ function project_project_form($node) {
   );
 
   $description = t('E-mail address where the project owner can be contacted.');
-  if (module_exists('project_issue')) {
-    $description .= ' '. t('This will be used as the From: address for issue subscription e-mails.');
-  }
 
   $form['project']['mail'] = array(
     '#type' => 'textfield',
Index: project_issue/UPGRADE.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/UPGRADE.txt,v
retrieving revision 1.3
diff -u -p -r1.3 UPGRADE.txt
--- project_issue/UPGRADE.txt	2 Nov 2007 01:47:16 -0000	1.3
+++ project_issue/UPGRADE.txt	5 Nov 2007 15:57:49 -0000
@@ -56,3 +56,15 @@ Upgrading to 5.x-2.* (from the 4.7.x-2.*
     5. For the 'project_issue module' select box, select update 5200.
     6. Click on 'Update'.
 
+  NEW SETUP FOR ISSUE EMAILS
+  In the past, the "From" address of all project issue e-mail notifications was
+  the address entered by the project owner in the "Project e-mail" field on the
+  project's settings page. This created a privacy problem, because unbeknownst
+  to them, their e-mail address was being revealed to other users subscribed to
+  their issue queue e-mails.
+
+  To correct this issue, all project issue e-mails now have a global "From" address.
+  This defaults to the global site e-mail, but can be customized using the "Reply-to
+  address on e-mail notifications" setting on the Project issue settings page
+  (admin/project/project-issue-settings). 
+
Index: project_issue/mail.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/mail.inc,v
retrieving revision 1.92
diff -u -p -r1.92 mail.inc
--- project_issue/mail.inc	4 Nov 2007 21:50:23 -0000	1.92
+++ project_issue/mail.inc	5 Nov 2007 15:57:49 -0000
@@ -248,7 +248,7 @@ function project_mail_notify($nid) {
 
   // Create mail header
   $sender->name = mime_header_encode(t('!name (!site)', array('!name' => $user->name, '!site' => variable_get('site_name', 'Drupal'))));
-  $sender->mail = $project->mail;
+  $sender->mail = variable_get('project_issue_reply_to', variable_get('site_mail', ini_get('sendmail_from')));
   // The sender name is enclosed by double quotes below
   // to satisfy RFC2822 <http://www.faqs.org/rfcs/rfc2822.html>,
   // which requires double quotes when special characters (including
Index: project_issue/project_issue.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/project_issue.module,v
retrieving revision 1.70
diff -u -p -r1.70 project_issue.module
--- project_issue/project_issue.module	3 Nov 2007 23:46:28 -0000	1.70
+++ project_issue/project_issue.module	5 Nov 2007 15:57:49 -0000
@@ -176,6 +176,13 @@ function project_issue_settings_form() {
     '#description' => t('If selected, user signatures will be appended to the display of issue followups.'),
   );
 
+  $form['project_issue_reply_to'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Reply-to address on e-mail notifications'),
+    '#default_value' => variable_get('project_issue_reply_to', variable_get('site_mail', ini_get('sendmail_from'))),
+    '#description' => t('All issue e-mails sent via subscriptions will appear from this e-mail address.'),
+  );
+
   if (module_exists('mailhandler')) {
     // TODO: move this stuff to mailhandler.module ?
     $items = array(t('<none>'));
@@ -183,12 +190,10 @@ function project_issue_settings_form() {
     while ($mail = db_result($result, $i++)) {
       $items[$mail] = $mail;
     }
-    $form['project_issue_reply_to'] = array(
-      '#type' => 'select',
-      '#title' => t('Reply-to address on e-mail notifications'),
-      '#default_value' => variable_get('project_reply_to', ''),
-      '#options' => $items,
-    );
+
+    // Switch reply-to to a select box instead.
+    $form['project_issue_reply_to']['#type'] = 'select';
+    $form['project_issue_reply_to']['#options'] = $items;
   }
 
   return system_settings_form($form);
