--- sites/all/modules/forward/forward.module	2009-11-03 22:51:59.000000000 +0000
+++ sites/all/modules/forward/forward_sender_address_fixed.module	2009-11-05 14:33:09.000000000 +0000
@@ -766,7 +766,14 @@ function forward_form_submit($form, &$fo
 
   $params['subject'] = t(variable_get('forward_'. $emailtype .'_subject', '!name has sent you a message from !site'), array('!name' => $form_state['values']['yname'], '!site' => variable_get('site_name', 'drupal')));
   
-  $params['from'] = trim($form_state['values']['yname'] .' <'. variable_get('forward_sender_address', variable_get('site_mail','')) .'>');
+  $sender_address = variable_get('forward_sender_address', variable_get('site_mail', ''));
+  if (empty($sender_address)) {
+    $params['from'] = trim($form_state['values']['yname'] .' <'. $form_state['values']['yemail'] .'>');
+  }
+  else {
+    $params['from'] = $sender_address;
+  }
+
   $params['headers']['Reply-To'] = trim($form_state['values']['yname'] .' <'. $form_state['values']['yemail'] .'>');
 
   $recipients = trim($form_state['values']['recipients']);