*** smtp.module	2011-05-27 10:22:09.000000000 -0700
--- smtp.module.fixed	2011-05-27 10:21:09.000000000 -0700
***************
*** 315,323 ****
  
    if ($from == NULL || $from == '') {
      // If from e-mail address is blank, use smtp_from config option.
!     if ($from = variable_get('smtp_from', '') == '') {
        // If smtp_from config option is blank, use site_email.
!       if ($from = variable_get('site_email', '') == '') {
          drupal_set_message(t('There is no submitted from address.'), 'error');
          watchdog('smtp', 'There is no submitted from address.', array(), WATCHDOG_ERROR);
          return FALSE;
--- 315,323 ----
  
    if ($from == NULL || $from == '') {
      // If from e-mail address is blank, use smtp_from config option.
!     if (($from = variable_get('smtp_from', '')) == '') {
        // If smtp_from config option is blank, use site_email.
!       if (($from = variable_get('site_email', '')) == '') {
          drupal_set_message(t('There is no submitted from address.'), 'error');
          watchdog('smtp', 'There is no submitted from address.', array(), WATCHDOG_ERROR);
          return FALSE;