--- mail_logger.install.orig	2011-02-01 17:26:02.000000000 +0100
+++ mail_logger.install	2011-02-01 18:04:42.000000000 +0100
@@ -26,7 +26,7 @@
         'length'        => 255,
         'not null'      => TRUE,
       ),
-      'to'            => array(
+      'mail_to'            => array(
         'description'   => 'to whom this mail is going',
         'type'          => 'varchar',
         'length'        => 255,
@@ -44,7 +44,7 @@
         'not null'      => TRUE,
         'size'          => 'big',
       ),
-      'from'          => array(
+      'mail_from'          => array(
         'description'   => 'the FROM email address',
         'type'          => 'varchar',
         'length'        => 255,
@@ -69,13 +69,13 @@
         'not null'      => TRUE,
       ),
     ),
-    'primary key'     => array('`mlid`'),
+    'primary key'     => array('mlid'),
     'indexes'         => array(
-      '`to`'              => array('`to`'),
-      '`from`'            => array('`from`'),
-      '`subject`'         => array(array('`subject`', 20)),
-      '`date_sent`'       => array('`date_sent`'),
-      '`language`'        => array('`language`'),
+      'mail_to'            => array('mail_to'),
+      'mail_from'            => array('mail_from'),
+      'subject'         => array(array('subject', 20)),
+      'date_sent'       => array('date_sent'),
+      'language'        => array('language'),
     ),
   );
 
@@ -119,7 +119,7 @@
         'not null'    => TRUE,
       )
     );
-    db_add_index($ret, 'mail_logger', '`language`', array('`language`'));
+    db_add_index($ret, 'mail_logger', 'language', array('language'));
   }
   return $ret;
 }
--- mail_logger.module.orig	2011-02-01 17:26:07.000000000 +0100
+++ mail_logger.module	2011-02-01 18:14:09.000000000 +0100
@@ -65,8 +65,8 @@
   $output .= '<div class="mail_logger_wrapper">';
   $output .= '<div class="mail_type_label">Mail Type: </div><div class="mail_type_data">'. $mail->mailkey .'</div>';
   $output .= '<div class="date_sent_label">Date Sent: </div><div class="date_sent_data">'. format_date($mail->date_sent, 'small') .'</div>';
-  $output .= '<div class="mail_from_label">From: </div><div class="mail_from_data">'. $mail->from .'</div>';
-  $output .= '<div class="mail_to_label">To: </div><div class="mail_to_data">'. $mail->to .'</div>';
+  $output .= '<div class="mail_from_label">From: </div><div class="mail_from_data">'. $mail->mail_from .'</div>';
+  $output .= '<div class="mail_to_label">To: </div><div class="mail_to_data">'. $mail->mail_to .'</div>';
   $output .= '<div class="mail_subject_label">Subject: </div><div class="mail_subject_data">'. $mail->subject .'</div>';
   $output .= '<div class="mail_body_label">Body: </div><div class="mail_body_data">'. nl2br($mail->body) .'</div>';
   $output .= '</div>';
@@ -97,7 +97,7 @@
   );
 
   db_query("INSERT INTO {mail_logger} (
-  `mlid` , `mailkey` , `to` , `subject` , `body` , `from` , `headers`, `date_sent`, `language`
+  mlid , mailkey , mail_to , subject , body , mail_from , headers, date_sent, language
   ) VALUES (
   NULL, '%s', '%s', '%s', '%s', '%s', '%s', %d, '%s' )", $args);
 
@@ -164,13 +164,13 @@
     array('data' => t('Date Sent'), 'field' => 'ml.date_sent', 'sort' => 'desc'),
     array('data' => t('Mailkey'), 'field' => 'ml.mailkey'),
     array('data' => t('Language'), 'field' => 'ml.language'),
-    array('data' => t('To'), 'field' => 'ml.to'),
-    array('data' => t('From'), 'field' => 'ml.from'),
+    array('data' => t('To'), 'field' => 'ml.mail_to'),
+    array('data' => t('From'), 'field' => 'ml.mail_from'),
     array('data' => t('Subject'), 'field' => 'ml.subject'),
   );
   $tablesort = tablesort_sql($header);
 
-  $sql = "SELECT ml.mlid, ml.mailkey, ml.language, ml.to, ml.from, ml.subject, ml.date_sent FROM {mail_logger} ml";
+  $sql = "SELECT ml.mlid, ml.mailkey, ml.language, ml.mail_to, ml.mail_from, ml.subject, ml.date_sent FROM {mail_logger} ml";
   $type = $_SESSION['mail_logger_overview_filter'];
 
   if ($type != 'all') {
@@ -188,8 +188,8 @@
         format_date($mail_logger->date_sent, 'small'),
         $mail_logger->mailkey,
         $mail_logger->language,
-        $mail_logger->to,
-        $mail_logger->from,
+        $mail_logger->mail_to,
+        $mail_logger->mail_from,
         l(truncate_utf8($mail_logger->subject, 56, TRUE, TRUE), 'admin/reports/mail-logger/mail/'. $mail_logger->mlid ),
       ),
     );
@@ -316,14 +316,14 @@
       $object = (array) $object;
       $values['mlid'] = $object['id'];
       $values['mailkey'] = check_plain($object['mailkey']);
-      $values['to'] = check_plain($object['to']);
-      $values['to-raw'] = $object['to'];
+      $values['to'] = check_plain($object['mail_to']);
+      $values['to-raw'] = $object['mail_to'];
       $values['subject'] = check_plain($object['subject']);
       $values['subject-raw'] = $object['subject'];
       $values['body'] = check_markup($object['body']);
       $values['body-raw'] = $object['body'];
-      $values['from'] = check_plain($object['from']);
-      $values['from-raw'] = $object['from'];
+      $values['from'] = check_plain($object['mail_from']);
+      $values['from-raw'] = $object['mail_from'];
       $values['date'] = format_date($object['date_sent']);
       $values['language'] = is_object($object['language']) ? $object['language']->language : $object['language'];
       break;