--- uc_order.module.orig	2009-05-29 15:12:33.000000000 -0700
+++ uc_order.module	2009-05-29 15:12:42.000000000 -0700
@@ -416,6 +416,7 @@ function uc_order_token_values($type, $o
       $values['order-comments'] = empty($result) ? t('<i>No comments left.</i>') : check_plain($result);
       $result = db_result(db_query_range("SELECT message FROM {uc_order_comments} WHERE order_id = %d AND uid > 0 ORDER BY created DESC", $order->order_id, 0, 1));
       $values['order-last-comment'] = empty($result) ? t('<i>No comment found.</i>') : check_plain($result);
+      $values['order-last-comment-raw'] = empty($result) ? t('<i>No comment found.</i>') : $result;
       $values['order-status'] = uc_order_status_data($order->order_status, 'title');
       $values['order-date-created'] = format_date($order->created, 'small');
       $values['order-date-modified'] = format_date($order->modified, 'small');
@@ -451,6 +452,7 @@ function uc_order_token_list($type = 'al
     $tokens['order']['order-last-name'] = t('The last name associated with the order.');
     $tokens['order']['order-comments'] = t('Comments left by the customer.');
     $tokens['order']['order-last-comment'] = t('Last order comment left by an administrator (not counting the order admin comments).');
+    $tokens['order']['order-last-comment-raw'] = t('Last order comment left by an administrator (not counting the order admin comments).  Use with caution: this is unescaped raw input.');
     $tokens['order']['order-status'] = t('The current order status.');
     $tokens['order']['order-date-created'] = t('The date and time when the order was created.');
     $tokens['order']['order-date-modified'] = t('The date and time when the order was last modified.');