diff --git includes/maillog.mail.inc includes/maillog.mail.inc
index 9248d99..7242fdf 100644
--- includes/maillog.mail.inc
+++ includes/maillog.mail.inc
@@ -46,19 +46,20 @@ class MaillogMailSystem implements MailSystemInterface {
    // Log the e-mail
    if (variable_get('maillog_log', TRUE)) {
      $record = new stdClass;
- 
+
      $record->header_message_id = isset($message['headers']['Message-ID']) ? $message['headers']['Message-ID'] : NULL;
      $record->subject = $message['subject'];
-     $record->body = $message['body'][0];
+     $formatted = DefaultMailSystem::format($message);
+     $record->body = $formatted['body'];
      $record->header_from = isset($message['from']) ? $message['from'] : NULL;
      $record->header_to = isset($message['to']) ? $message['to'] : NULL;
      $record->header_reply_to = isset($message['headers']['Reply-To']) ? $message['headers']['Reply-To'] : '';
      $record->header_all = serialize($message['headers']);
      $record->sent_date = time();
- 
+
      drupal_write_record('maillog', $record);
    }
- 
+
    // Display the e-mail using Devel module
    if (variable_get('maillog_devel', TRUE) && function_exists('dpm')) {
      $devel_msg = array();
@@ -67,13 +68,14 @@ class MaillogMailSystem implements MailSystemInterface {
      $devel_msg[t('To')] = $message['to'];
      $devel_msg[t('Reply-To')] = isset($message['reply_to']) ? $message['reply_to'] : NULL;
      $devel_msg[t('Header')] = $message['headers'];
-     $devel_msg[t('Body')] = $message['body'][0];
- 
+     $formatted = DefaultMailSystem::format($message);
+     $devel_msg[t('Body')] = $formatted['body'];
+
      dpm($devel_msg, 'maillog');
    }
-   
+
    return TRUE;
-   
+
   }
-  
+
 }