diff --git a/includes/mimemail.admin.inc b/includes/mimemail.admin.inc
index 9e09c2b..a679283 100644
--- a/includes/mimemail.admin.inc
+++ b/includes/mimemail.admin.inc
@@ -42,7 +42,7 @@ function mimemail_admin_settings() {
     '#type'          => 'checkbox',
     '#title'         => t('Use simple address format'),
     '#default_value' => variable_get('mimemail_simple_address', FALSE),
-    '#description' => t('Use the simple format of user@example.com for all email addresses.'),
+    '#description' => t('Use the simple format of user@example.com for all recipient email addresses.'),
   );
   $form['mimemail']['mimemail_sitestyle'] = array(
     '#type'          => 'checkbox',
diff --git a/mimemail.inc b/mimemail.inc
index b232b2e..2f1881b 100644
--- a/mimemail.inc
+++ b/mimemail.inc
@@ -508,18 +508,18 @@ function _mimemail_url($url, $embed_file = NULL) {
  *
  * @param mixed $address
  *   A user object, a text email address or an array containing name, mail.
+ * @param boolean $simplify
+ *   Determines if the address needs to be simplified. Defaults to FALSE.
  *
  * @return string
  *   A formatted address string or FALSE.
  */
-function mimemail_address($address) {
-  $simple_address = variable_get('mimemail_simple_address', 0);
-
+function mimemail_address($address, $simplify = FALSE) {
   if (is_array($address)) {
     // It's an array containing 'mail' and/or 'name'.
     if (isset($address['mail'])) {
       $output = '';
-      if (empty($address['name']) || $simple_address) {
+      if (empty($address['name']) || $simplify) {
         return $address['mail'];
       }
       else {
@@ -536,7 +536,7 @@ function mimemail_address($address) {
 
   // It's a user object.
   if (is_object($address) && isset($address->mail)) {
-    if (empty($address->name) || $simple_address) {
+    if (empty($address->name) || $simplify) {
       return $address->mail;
     }
     else {
diff --git a/mimemail.module b/mimemail.module
index bf39ac3..b657a8c 100644
--- a/mimemail.module
+++ b/mimemail.module
@@ -316,6 +316,7 @@ function mimemail_prepare_message($message) {
 
   $site_name = variable_get('site_name', 'Drupal');
   $site_mail = variable_get('site_mail', ini_get('sendmail_from'));
+  $simple_address = variable_get('mimemail_simple_address', 0);
 
   // Override site mails default sender when using default engine.
   if ((empty($from) || $from == $site_mail)
@@ -373,7 +374,7 @@ function mimemail_prepare_message($message) {
   $mail = mimemail_html_body($body, $subject, $plain, $plaintext, $attachments);
   $headers = array_merge($message['headers'], $headers, $mail['headers']);
 
-  $message['to'] = mimemail_address($to);
+  $message['to'] = mimemail_address($to, $simple_address);
   $message['from'] = $from;
   $message['subject'] = $subject;
   $message['body'] = $mail['body'];