Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.649
diff -u -p -r1.649 system.module
--- modules/system/system.module	26 Nov 2008 18:56:16 -0000	1.649
+++ modules/system/system.module	26 Nov 2008 22:23:20 -0000
@@ -1959,8 +1959,14 @@ function system_send_email_action($objec
       }
       break;
     default:
-      // We are being called directly.
-      $node = $object;
+      // Check context for node.
+      if (!isset($object) && isset($context['node'])) {
+        $node = $context['node'];
+      }
+      else {
+        // We are being called directly.
+        $node = $object;
+      }
   }
 
   $recipient = $context['recipient'];
@@ -2087,8 +2093,14 @@ function system_message_action(&$object,
       );
       break;
     default:
-      // We are being called directly.
-      $node = $object;
+      // Check context for node.
+      if (!isset($object) && isset($context['node'])) {
+        $node = $context['node'];
+      }
+      else {
+        // We are being called directly.
+        $node = $object;
+      }
   }
 
   if (isset($node) && is_object($node)) {