Index: includes/mimemail.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mimemail/includes/mimemail.admin.inc,v
retrieving revision 1.1
diff -u -r1.1 mimemail.admin.inc
--- includes/mimemail.admin.inc	22 Feb 2009 20:55:46 -0000	1.1
+++ includes/mimemail.admin.inc	15 Jul 2010 17:34:53 -0000
@@ -29,13 +29,21 @@
   $engines = mimemail_get_engines();
 
   $form = array();
-  $form['site_mail'] = array(
+  $form['mimemail']['mimemail_name'] = array(
     '#type'          => 'textfield',
-    '#title'         => t('E-mail address'),
-    '#default_value' => variable_get('site_mail', ini_get('sendmail_from')),
+    '#title'         => t('Sender name'),
+    '#default_value' => variable_get('mimemail_name', variable_get('site_name', 'Drupal')),
     '#size'          => 60,
     '#maxlength'     => 128,
-    '#description'   => t('A valid e-mail address for this website, used by the auto-mailer during registration, new password requests, notifications, etc.')
+    '#description'   => t('The name that all site e-mails will be from.'),
+  );
+  $form['mimemail']['mimemail_mail'] = array(
+    '#type'          => 'textfield',
+    '#title'         => t('Sender e-mail address'),
+    '#default_value' => variable_get('mimemail_mail', variable_get('site_mail', ini_get('sendmail_from'))),
+    '#size'          => 60,
+    '#maxlength'     => 128,
+    '#description'   => t('The e-mail address that all site e-mails will be from.'),
   );
   $form['mimemail']['mimemail_alter'] = array(
     '#type'          => 'checkbox',
Index: mimemail.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mimemail/mimemail.inc,v
retrieving revision 1.48
diff -u -r1.48 mimemail.inc
--- mimemail.inc	1 Jul 2010 17:50:28 -0000	1.48
+++ mimemail.inc	15 Jul 2010 17:34:52 -0000
@@ -51,8 +51,9 @@
   }
   preg_match('/[a-z0-9\-\.]+@{1}[a-z0-9\-\.]+/i', $from, $matches);
   $from_email = $matches[0];
-  // allow a mail to overwrite standard headers.
-  $headers = array_merge(array('Return-Path' => "<$from_email>", 'Errors-To' => $from, 'From' => $from, 'Content-Type' => 'text/plain; charset=utf-8; format=flowed'), $headers);
+
+  // Allow a mail to overwrite standard headers.
+  $headers = array_merge($headers, array('Return-Path' => "<$from_email>", 'Errors-To' => $from, 'From' => $from));
 
   // Run all headers through mime_header_encode() to convert non-ascii
   // characters to an rfc compliant string, similar to drupal_mail().
Index: mimemail.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mimemail/mimemail.module,v
retrieving revision 1.47
diff -u -r1.47 mimemail.module
--- mimemail.module	1 Jul 2010 17:30:52 -0000	1.47
+++ mimemail.module	15 Jul 2010 17:34:53 -0000
@@ -103,10 +103,13 @@
 function mimemail_prepare($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
+  $site_name = variable_get('site_name', 'Drupal');
+  $site_mail = variable_get('site_mail', ini_get('sendmail_from'));
+
+  if ($site_mail == $sender) {
     $sender = array(
-        'name' => variable_get('site_name', 'Drupal'),
-        'mail' => variable_get('site_mail', ini_get('sendmail_from')),
+      'name' => variable_get('mimemail_name', $site_name),
+      'mail' => variable_get('mimemail_mail', $site_mail),
     );
   }