diff -urp mimemail/mimemail.inc mimemail/mimemail.inc
--- mimemail/mimemail.inc	2008-08-08 00:24:18.000000000 -0400
+++ mimemail/mimemail.inc	2008-08-10 01:32:05.000000000 -0400
@@ -503,7 +503,7 @@ function _mimemail_url($url) {
     return '#'. $fragment;
   }
 
-  return url($path, $query, $fragment, TRUE);
+  return url($path, array('query' => $query, 'fragment' => $fragment, 'absolute' => TRUE));
 }
 
 /**
diff -urp mimemail/mimemail.info mimemail/mimemail.info
--- mimemail/mimemail.info	2007-01-05 00:44:09.000000000 -0500
+++ mimemail/mimemail.info	2008-08-10 01:32:05.000000000 -0400
@@ -2,3 +2,4 @@
 name = Mime Mail
 description = E-mail with HTML and attachments
 package = Mail
+core = 6.x
\ No newline at end of file
diff -urp mimemail/mimemail.module mimemail/mimemail.module
--- mimemail/mimemail.module	2008-08-08 20:53:14.000000000 -0400
+++ mimemail/mimemail.module	2008-08-10 01:35:07.000000000 -0400
@@ -9,19 +9,17 @@
  * Implementation of hook_menu()
  */
 function mimemail_menu() {
-  $items[] = array(
-    'path' => 'admin/settings/mimemail',
-    'title' => t('Mail'),
-    'description' => t('HTML E-mail settings'),
-    'callback' => 'drupal_get_form',
-    'callback arguments' => 'mimemail_settings',
-    'access' => user_access('administer site configuration'),
+  $items['admin/settings/mimemail'] = array(
+    'title' => 'Mime Mail',
+    'description' => 'HTML E-mail settings',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('mimemail_settings'),
+    'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
   );
-  $items[] = array(
-    'path' => 'mimemail',
-    'callback' => 'mimemail_post',
-    'access' => variable_get('mimemail_incoming', FALSE),
+  $items['mimemail'] = array(
+    'page callback' => 'mimemail_post',
+    'access callback' => variable_get('mimemail_incoming', FALSE),
     'type' => MENU_CALLBACK,
   );
   return $items;
@@ -370,11 +368,13 @@ function mimemail_mailengine($op, $messa
 if (strpos(variable_get('smtp_library', ''), 'mimemail')
   && !function_exists('drupal_mail_wrapper')) {
 
-  function drupal_mail_wrapper($mailkey, $to, $subject, $body, $from, $headers) {
-    if (variable_get('mimemail_format', 0)) {
-      $body = check_markup($body, $format);
-    }
-
+  function drupal_mail_wrapper(&$message) {
+    $to = $message['to'];
+    $from = $message['from'];
+    $subject = $message['subject'];
+    $body = $message['body'];
+    $headers = isset($message['headers']) ? $message['headers'] : array();
+    $mailkey = isset($message['mailkey']) ? $message['mailkey'] : '';
     return mimemail($from, $to, $subject, $body, NULL, $headers, NULL, array(), $mailkey);
   }
 }
@@ -472,6 +472,17 @@ function mimemail_address($address) {
 }
 
 /**
+ * Implementation of hook_theme().
+ */
+function mimemail_theme() {
+  return array(
+    'mimemail_message' => array(
+      'arguments' => array('body' => NULL, 'mailkey' => NULL)
+    )
+  );
+}
+
+/**
  * Themes the message body.
  *
  * @param $body