Index: token_actions.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/token/token_actions.module,v
retrieving revision 1.4.2.1
diff -u -r1.4.2.1 token_actions.module
--- token_actions.module	4 May 2008 22:51:37 -0000	1.4.2.1
+++ token_actions.module	7 May 2008 20:40:54 -0000
@@ -125,9 +125,9 @@
   $from = variable_get('site_mail', ini_get('sendmail_from'));
   $recipient = token_replace_multiple($context['recipient'], $context);
 
-  $subject = token_replace_all($context['subject'], $context);
+  $subject = token_replace_multiple($context['subject'], $context);
   $subject = str_replace(array("\r", "\n"), '', $subject);
-  $message = token_replace_all($context['message'], $context);
+  $message = token_replace_multiple($context['message'], $context);
   $body = drupal_html_to_text($message);
 
   if (drupal_mail('action_send_email', $recipient, $subject, $body, $from )) {