Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.585.2.4
diff -u -r1.585.2.4 system.module
--- modules/system/system.module	8 Feb 2008 23:23:19 -0000	1.585.2.4
+++ modules/system/system.module	12 Feb 2008 13:59:20 -0000
@@ -1662,18 +1662,16 @@
   $recipient = $context['recipient'];
 
   if (isset($node)) {
-    if (!isset($account)) {
-      $account = user_load(array('uid' => $node->uid));
-    }
+    $author = user_load(array('uid' => $node->uid));
     if ($recipient == '%author') {
-      $recipient = $account->mail;
+      $recipient = $author->mail;
     }
   }
 
   if (!isset($account)) {
     $account = $user;
-
   }
+
   $language = user_preferred_language($account);
   $params = array('account' => $account, 'object' => $object, 'context' => $context);
   if (isset($node)) {