--- /tmp/views_send/views_send.module	2010-06-17 16:11:54.000000000 -0300
+++ views_send.module	2010-11-08 08:51:21.000000000 -0200
@@ -340,6 +340,12 @@
   // merging them to the user defined headers.
   $headers = _views_send_headers($context['views_send_receipt'], $context['views_send_priority'], $from_mail, $context['views_send_headers']);
 
+  // If dealing with Plaintext format along with mimemail, we set a fake header 
+  // to be removed later
+  if ($context['views_send_message_format'] == VIEWS_SEND_FORMAT_PLAIN && VIEWS_SEND_MIMEMAIL) {
+    $headers['X-Views-Send-Plaintext'] = TRUE;
+  }
+
   // All tokens replacements, PHP processing and formatting were done.
   // We are performing now all usual mail processing, altering and preparing.
   _views_send_prepare_mail($from_name, $from_mail, $to_name, $to_mail, $subject, $body, $headers, $context['views_send_message_format']);
@@ -601,27 +607,17 @@
   $to = _views_send_format_address($message->to_mail, $message->to_name);
   $from = _views_send_format_address($message->from_mail, $message->from_name);
 
-  // Mime Mail has no separate rutines for sending and preparing.
-  // We are using pieces of code from mimemail() function to send the message.
   if (VIEWS_SEND_MIMEMAIL) {
-    $mail = array(
-      'address' => $to,
-      'subject' => mime_header_encode($message->subject),
-      'body' => $message->body,
-      'sender' => $from,
-      'headers' => $headers,
-    );
-
-    $engine = variable_get('mimemail_engine', 'mimemail') .'_mailengine';
-    if (!function_exists($engine)) {
-      return FALSE;
+    // Retrieve header for Plaintext option
+    // And remove it
+    if (isset($headers['X-Views-Send-Plaintext'])) {
+      $plaintext = TRUE;
+      unset($headers['X-Views-Send-Plaintext']);
     }
-
-    // Workaround a Mime Mail inclusion issue...
-    if ($engine == 'mimemail_mailengine') {
-      require_once(drupal_get_path('module', 'mimemail') .'/mimemail.inc');
+    else {
+      $plaintext = FALSE;
     }
-    return $engine('send', $mail);
+    return mimemail($from, $to, $message->subject, $message->body, $plaintext, $headers);
   }
   else {
     $mail = array(