--- ecommerce/store/store.module.orig	2007-05-08 07:18:28.000000000 -0400
+++ ecommerce/store/store.module	2007-06-09 21:49:22.000000000 -0400
@@ -2583,7 +2583,7 @@
  * Implements hook_token_list() from the token module.
  */
 function store_token_list($type = 'all') {
-  if (in_array($type, array('all', STORE_TOKEN_TYPE, ECMAIL_TYPE_CUSTOMER_INVOICE, ECMAIL_TYPE_PROCESSING_ERROR, ECMAIL_TYPE_CANCEL_TXN, ECMAIL_TYPE_ASK_CUSTOMER))) {
+  if (in_array($type, array('all', STORE_TOKEN_TYPE, ECMAIL_TYPE_CUSTOMER_INVOICE, ECMAIL_TYPE_PROCESSING_ERROR, ECMAIL_TYPE_CANCEL_TXN, ECMAIL_TYPE_ASK_CUSTOMER, ECMAIL_TYPE_SHIP_NOTICE))) {
     $vars[STORE_TOKEN_TYPE]['txn-id']                = t('Transaction ID.');
     $vars[STORE_TOKEN_TYPE]['txn-balance']           = t('Transaction balance.');
     $vars[STORE_TOKEN_TYPE]['txn-order-date']        = t('Date the order/transaction was created.');
@@ -2613,7 +2613,7 @@
  * Implements hook_token_values() from the token module.
  */
 function store_token_values($type, $object = NULL) {
-  if (in_array($type, array(STORE_TOKEN_TYPE, ECMAIL_TYPE_CUSTOMER_INVOICE, ECMAIL_TYPE_PROCESSING_ERROR, ECMAIL_TYPE_CANCEL_TXN, ECMAIL_TYPE_ASK_CUSTOMER))) {
+  if (in_array($type, array(STORE_TOKEN_TYPE, ECMAIL_TYPE_CUSTOMER_INVOICE, ECMAIL_TYPE_PROCESSING_ERROR, ECMAIL_TYPE_CANCEL_TXN, ECMAIL_TYPE_ASK_CUSTOMER, ECMAIL_TYPE_SHIP_NOTICE))) {
     global $base_url;
 
     $txn = (object) $object;
--- ecommerce/shipping/shipping.module.orig	2007-04-25 00:38:05.000000000 -0400
+++ ecommerce/shipping/shipping.module	2007-06-09 21:49:22.000000000 -0400
@@ -695,8 +695,8 @@
 function shipping_mail_reset($type) {
   $mids = array();
   if ($type == ECMAIL_TYPE_SHIP_NOTICE) {
-    $defsub = t("Your %site order has shipped (#%txnid)");
-    $defbody = t("Hello %first_name,\n\nWe have shipped the following item(s) from Order #%txnid, received  %order_date.\n\nItems(s) Shipped:\n%items\n%shipping_to\nQuestions about your order? Please contact us at %email.\n\nThanks for shopping at %site.  We hope to hear from you again real soon!\n\n%uri");
+    $defsub = t("Your [site-name] order has shipped (#[txn-id])");
+    $defbody = t("Hello [txn-billing-firstname],\n\nWe have shipped the following item(s) from Order #[txn-id], received  [txn-order-date].\n\nItems(s) Shipped:\n[txn-items]\n[txn-ship-to]\nQuestions about your order? Please contact us at [site-mail].\n\nThanks for shopping at [site-name].  We hope to hear from you again real soon!\n\n[site-url]");
     $mid = ec_mail_import_old_mail('Default shipping notification', ECMAIL_TYPE_SHIP_NOTICE, 'shipping_email_shipping_notification_subject', $defsub, 'shipping_email_shipping_notification_body', $defbody);
     ec_mail_variable_change(ECMAIL_TYPE_SHIP_NOTICE, $mid, TRUE);
   }
--- ecommerce/ec_mail/ec_mail.module.orig	2007-04-24 21:36:19.000000000 -0400
+++ ecommerce/ec_mail/ec_mail.module	2007-06-09 21:49:21.000000000 -0400
@@ -652,7 +652,7 @@
     $mail['from'] = variable_get('site_mail', ini_get('sendmail_from'));
   }
   
-  drupal_mail('ec_'. str_replace(' ', '_', $mail['type']), $mail['to'], $mail['subject'], $mail['body'], $mail['from']);
+  return drupal_mail('ec_'. str_replace(' ', '_', $mail['type']), $mail['to'], $mail['subject'], $mail['body'], $mail['from']);
 }
 
 /**