=== modified file 'uc_cart/uc_cart.ca.inc'
--- uc_cart/uc_cart.ca.inc	2009-04-06 16:50:01 +0000
+++ uc_cart/uc_cart.ca.inc	2009-04-23 19:03:29 +0000
@@ -79,7 +79,6 @@
           'subject' => t('Your Order at [store-name]'),
           'template' => 'customer',
           'view' => 'checkout-mail',
-          'format' => 1,
         ),
       ),
     ),
@@ -105,7 +104,6 @@
           'subject' => t('New Order at [store-name]'),
           'template' => 'admin',
           'view' => 'admin-mail',
-          'format' => 1,
         ),
       ),
     ),

=== modified file 'uc_order/uc_order.ca.inc'
--- uc_order/uc_order.ca.inc	2009-04-20 17:50:49 +0000
+++ uc_order/uc_order.ca.inc	2009-04-23 19:03:13 +0000
@@ -1085,6 +1085,9 @@
 function uc_order_action_email_invoice($order, $settings) {
   $language = user_preferred_language($account);
 
+  // Use the Full HTML input format.
+  $settings['format'] = 2;
+
   // Token replacements for the subject and body
   $settings['replacements'] = array(
     'global' => NULL,
@@ -1136,9 +1139,6 @@
     '#required' => TRUE,
   );
 
-  // We add the #is_format element to allow us to locate and configure the filters.
-  $form['format'] = filter_form($settings['format']) + array('#is_format' => TRUE);
-
   $form['token_help'] = array(
     '#type' => 'fieldset',
     '#title' => t('Replacement patterns'),