Index: forward.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/forward/forward.module,v
retrieving revision 1.55.2.6
diff -u -r1.55.2.6 forward.module
--- forward.module	28 Apr 2008 21:28:37 -0000	1.55.2.6
+++ forward.module	8 Aug 2008 16:23:05 -0000
@@ -181,6 +181,13 @@
     '#maxlength' => 40,
     '#description' => t('The address to send from.  Should be a functioning email address.'),
   );
+  $form['forward_page_defaults']['forward_sender_use_default'] = array(
+    '#type' => 'radios',
+    '#title' => t('Default from address'),
+    '#default_value' => variable_get('forward_sender_use_default', 1),
+    '#options' => array(0 => t('Use sender\'s email address'), 1 => t('Always use default email address')),
+    '#description' => t('Choose which email address to use as from email address.'),
+  );
   $form['forward_page_defaults']['forward_header_image'] = array(
     '#type' => 'textfield',
     '#title' => t('Header Image for Email'),
@@ -546,9 +553,13 @@
   $recipients = str_replace(', ', ', ', $recipients);
   $recipients = str_replace(',  ', ', ', $recipients);
   $recipients = explode(', ', $recipients);
-  
+  if(variable_get('forward_sender_use_default', '') == 0) {
+    $from = $params['from'];
+  } else {
+    $from = variable_get('forward_sender_addy', '');
+  }
   foreach ($recipients as $to) {
-    drupal_mail('forward', 'forward_page', $to, language_default(), $params);
+    drupal_mail('forward', 'forward_page', $to, language_default(), $params, $from);
   }
 
   if ($nid == '') {