*** mass_contact.module.original	Thu Nov  1 12:45:07 2007
--- mass_contact.module	Thu Nov  1 16:58:28 2007
***************
*** 865,901 ****
        return ('');
      }
  
-     // Check to see if the SMTP Authentication Support module (http://drupal.org/project/smtp).
-     // If it exists and is active, we have to do things differently with the recipient list.
-     if (module_exists('smtp') && variable_get('smtp_on', 1) == 1) {
-       // Send the message to each recipient, one at a time.
-       foreach ($recipientouta as $rnamea => $rmaila) {
-         // set bcc
-         if ($bcc == 1) { // hidden recipients
-           $headers['Bcc'] = $rmaila;
-           $to = $from;
-         }
-         else {
-           $to = $rmaila;
-         }
- 
-         // Send the e-mail to the recipients:
-         if ($headers) {
-           $success = drupal_mail('mass-contact-page-mail', $to, $subject, $body, $from, $headers);
-         }
-         else {
-           $success = drupal_mail('mass-contact-page-mail', $to, $subject, $body, $from);
-         }
- 
-         if ($success) {
-           drupal_set_message(t('[Success] Send Once: -e-mails', array('-e-mails' => $rmaila)));
-         }
-         else {
-           ++$send_error;
-         }
-       }
-     }
-     else {
        $recipientout = array();
        // Check for recipient limit and break up recipient list, if necessary.
        $recip_limit = variable_get('mass_contact_recipient_limit', 0);
--- 865,870 ----
***************
*** 1002,1008 ****
            ++$send_error;
          }
        }
-     }
  
  
      // Error checking & reporting and node saving.
--- 971,976 ----