Index: mimemail.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mimemail/mimemail.module,v
retrieving revision 1.46
diff -u -r1.46 mimemail.module
--- mimemail.module	20 May 2009 23:37:26 -0000	1.46
+++ mimemail.module	10 Mar 2010 20:43:55 -0000
@@ -66,7 +66,7 @@
  *
  * This function first determines the mail engine to use, then prepares the
  * message by calling the mail engine's prepare function, or
- * mimemail_prepare() if another one does not exist, then sends the message.
+ * mimemail_prepare_message() if another one does not exist, then sends the message.
  *
  * @param $sender
  *   The email address or user object who is sending the message.
@@ -100,7 +100,7 @@
  * @return
  *   An array containing the MIME encoded message, including headers and body.
  */
-function mimemail_prepare($sender, $recipient, $subject, $body, $plaintext = NULL, $headers = array(), $text = NULL, $attachments = array(), $mailkey = '') {
+function mimemail_prepare_message($sender, $recipient, $subject, $body, $plaintext = NULL, $headers = array(), $text = NULL, $attachments = array(), $mailkey = '') {
   module_load_include('inc', 'mimemail');
 
   if (is_null($sender)) {        // use site default for sender
@@ -168,7 +168,7 @@
     $message = $engine_prepare($sender, $recipient, $subject, $body, $plaintext, $headers, $text, $attachments, $mailkey);
   }
   else {
-    $message = mimemail_prepare($sender, $recipient, $subject, $body, $plaintext, $headers, $text, $attachments, $mailkey);
+    $message = mimemail_prepare_message($sender, $recipient, $subject, $body, $plaintext, $headers, $text, $attachments, $mailkey);
   }
 
   return $engine('send', $message);