### Eclipse Workspace Patch 1.0
#P CVS mimemail HEAD
Index: mimemail.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mimemail/mimemail.inc,v
retrieving revision 1.21
diff -u -r1.21 mimemail.inc
--- mimemail.inc	26 Feb 2007 23:57:43 -0000	1.21
+++ mimemail.inc	14 Mar 2007 23:12:46 -0000
@@ -338,28 +338,30 @@
     $text = mimemail_html_to_text($body);
   }
   if ($plaintext) {
-    return array(
-      'body' => $text, 
-      'headers' => array('Content-Type' => 'text/plain; charset=utf-8'),
-    );
+    $parts = array(array(
+	  'content' => $text, 
+      'Content-Type' => 'text/plain; charset=utf-8',
+    ));
   }
-  $content_type = 'multipart/alternative';
+  else {
+    $content_type = 'multipart/alternative';
 
-  $text_part = array('Content-Type'=>'text/plain; charset=utf-8','content'=>$text);
-  
-  //expand all local links
-  $pattern = '/(<a[^>]+href=")([^"]*)/emi';
-  $body = preg_replace($pattern, '"\\1"._mimemail_url("\2")', $body);
-  
-  $mime_parts = mimemail_extract_files($body);
+    $text_part = array('Content-Type'=>'text/plain; charset=utf-8','content'=>$text);
+
+    //expand all local links
+    $pattern = '/(<a[^>]+href=")([^"]*)/emi';
+    $body = preg_replace($pattern, '"\\1"._mimemail_url("\2")', $body);
+
+    $mime_parts = mimemail_extract_files($body);
+
+    $content = array($text_part,array_shift($mime_parts)); 
+    $content = mimemail_multipart_body($content, $content_type, true);
+    $parts = array(array('Content-Type'=>$content['headers']['Content-Type'],'content'=>$content['body']));
 
-  $content = array($text_part,array_shift($mime_parts)); 
-  $content = mimemail_multipart_body($content, $content_type, true);
-  $parts = array(array('Content-Type'=>$content['headers']['Content-Type'],'content'=>$content['body']));
-
-  if ($mime_parts) {
-    $content_type = 'multipart/related';
-    $parts = array_merge($parts, $mime_parts);
+    if ($mime_parts) {
+      $content_type = 'multipart/related';
+      $parts = array_merge($parts, $mime_parts);
+    }
   }
 
   foreach ($attachments as $a) {