diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 73236f7..ea05ff8 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -3238,8 +3238,9 @@ function system_send_email_action_form($context) {
  */
 function system_send_email_action_validate($form, $form_state) {
   $form_values = $form_state['values'];
+  $has_tokens = count(token_scan($form_values['recipient'])) > 0 ? TRUE : FALSE;
   // Validate the configuration form.
-  if (!valid_email_address($form_values['recipient']) && strpos($form_values['recipient'], ':mail') === FALSE) {
+  if (!valid_email_address($form_values['recipient']) && !$has_tokens) {
     // We want the literal %author placeholder to be emphasized in the error message.
     form_set_error('recipient', t('Enter a valid email address or use a token e-mail address such as %author.', array('%author' => '[node:author:mail]')));
   }