--- sites/all/modules/simplenews/simplenews.module copy	2008-09-01 07:51:33.000000000 -0700
+++ sites/all/modules/simplenews/simplenews.module	2008-09-08 13:31:55.000000000 -0700
@@ -1336,9 +1336,17 @@
     foreach ($accounts as $account) {
       $subscription = simplenews_get_subscription($account);
       $params['context']['account'] = $subscription;
-      $result = drupal_mail('simplenews', 'test', $account->mail, $subscription->language, $params, $from['address']);
-      if ($result['result']) {
-        drupal_set_message(t('Test newsletter sent to %recipient.', array('%recipient' => $account->mail)));
+      if (module_exists('mimemail')) {
+	      $message = drupal_mail('simplenews', 'test', $account->mail, $subscription->language, $params, $from['formatted'], FALSE);
+	      if (mimemail($message['from'], $message['to'], $message['subject'], $message['body'], /* TODO: Hardcoded hack */ FALSE, $message['headers'], $message['body_text'])) {
+	      	drupal_set_message(t('Test newsletter sent via Mime Mial to %recipient.', array('%recipient' => $account->mail)));
+	      }
+      }
+      else {
+	      $result = drupal_mail('simplenews', 'test', $account->mail, $subscription->language, $params, $from['address']);
+	      if ($result['result']) {
+	        drupal_set_message(t('Test newsletter sent to %recipient.', array('%recipient' => $account->mail)));
+	      }
       }
     }
   }
@@ -1574,14 +1582,26 @@
       $params['context']['node'] = $node;
 
       // Send mail
-      $message = drupal_mail('simplenews', 'node', $subscription->mail, $subscription->language, $params, $params['from']['address'], TRUE);
-
-      if (variable_get('simplenews_debug', FALSE)) {
-        watchdog('simplenews', 'Outgoing email. Message type: %type<br />Subject: %subject<br />Recipient: %to', array('%type' => 'node', '%to' => $message['to'], '%subject' => $message['subject']), WATCHDOG_DEBUG);
+      if (module_exists('mimemail')) {
+      	$message = drupal_mail('simplenews', 'node', $subscription->mail, $subscription->language, $params, $params['from']['formatted'], FALSE);
+	      // Succesful mailings are recorded with their spool id.
+		    if (mimemail($message['from'], $message['to'], $message['subject'], $message['body'], /* HARDCODED HACK */ FALSE, $message['headers'], $message['body_text'])) {
+		    	$mail_sent[] = $key;
+		    }
+		    if (variable_get('simplenews_debug', FALSE)) {
+		      watchdog('simplenews', t('Outgoing email via mimemail. Message type: %type<br />Subject: %subject<br />Recipient: %to', array('%type' => 'node', '%to' => $message['to'], '%subject' => $message['subject'])), WATCHDOG_DEBUG);
+		    }
+      }
+      else {
+	      $message = drupal_mail('simplenews', 'node', $subscription->mail, $subscription->language, $params, $params['from']['address'], TRUE);
+	
+	      if (variable_get('simplenews_debug', FALSE)) {
+	        watchdog('simplenews', 'Outgoing email. Message type: %type<br />Subject: %subject<br />Recipient: %to', array('%type' => 'node', '%to' => $message['to'], '%subject' => $message['subject']), WATCHDOG_DEBUG);
+	      }
       }
 
-      // Succesfull mail messages are marked in the spool with status send.
-      // Succesfull mail are recorded with their spool id.
+      // Succesful mail messages are marked in the spool with status send.
+      // Succesful mailings are recorded with their spool id.
       if ($message['result']) {
         $mail_sent[] = $key;
       }