Index: ubercart/uc_cart/uc_cart.ca.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_cart/uc_cart.ca.inc,v
retrieving revision 1.1.2.12
diff -u -p -r1.1.2.12 uc_cart.ca.inc
--- ubercart/uc_cart/uc_cart.ca.inc	14 Apr 2009 13:51:12 -0000	1.1.2.12
+++ ubercart/uc_cart/uc_cart.ca.inc	22 Apr 2009 19:43:30 -0000
@@ -79,7 +79,7 @@ function uc_cart_ca_predicate() {
           'subject' => t('Your Order at [store-name]'),
           'template' => 'customer',
           'view' => 'checkout-mail',
-          'format' => 1,
+          'format' => 2,
         ),
       ),
     ),
Index: ubercart/uc_order/uc_order.ca.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_order/uc_order.ca.inc,v
retrieving revision 1.1.2.20
diff -u -p -r1.1.2.20 uc_order.ca.inc
--- ubercart/uc_order/uc_order.ca.inc	22 Apr 2009 17:41:53 -0000	1.1.2.20
+++ ubercart/uc_order/uc_order.ca.inc	22 Apr 2009 19:44:12 -0000
@@ -1106,7 +1106,7 @@ function uc_order_action_email_invoice($
   }
 
   foreach ($recipients as $email) {
-    $sent = drupal_mail('uc_order', 'action-mail', $email, $language, $settings, empty($settings['from']) ? uc_store_email_from() : $settings['form']);
+    $sent = drupal_mail('uc_order', 'action-mail', $email, $language, $settings, empty($settings['from']) ? uc_store_email_from() : $settings['from']);
 
     if (!$sent['result']) {
       watchdog('ca', 'Attempt to e-mail invoice for order @order_id to @email failed.', array('@email' => $email, '@order_id' => $order->order_id), WATCHDOG_ERROR);