--- notify.module.bak	2008-04-28 08:25:16.000000000 -0400
+++ notify.module	2008-04-28 08:41:05.000000000 -0400
@@ -338,7 +338,8 @@ function _notify_send() {
     _notify_switch_user($user->uid);
 
     // Fetch all new nodes and 'load' it to get proper body, etc.
-    $nresult = db_query(db_rewrite_sql('SELECT n.nid FROM {node} n WHERE (n.status = 1 OR n.moderate = 1) AND n.created > %d AND n.created <= %d ORDER BY n.created'), $period, time());
+    //$nresult = db_query(db_rewrite_sql('SELECT n.nid FROM {node} n WHERE (n.status = 1 OR n.moderate = 1) AND n.created > %d AND n.created <= %d ORDER BY n.created'), $period, time());
+    $nresult = db_query(db_rewrite_sql('SELECT n.nid FROM {node} n WHERE (n.status = 1 OR n.moderate = 1) AND ((n.created > %d AND n.created <= %d) OR (n.changed > %d AND n.changed <= %d)) ORDER BY n.created, n.changed'), $period, time(), $period, time());
     $nodes = array();
     while ($node = db_fetch_object($nresult)) {
       $nodes[$node->nid] = node_load($node->nid);
@@ -377,7 +378,25 @@ function _notify_send() {
           $node_body .= $mini_separator ."\n\n";
         }
         $node_body .= ++$node_count .'. '. t('@title', array('@title' => $node->title)) ."\n";
-        $node_body .= t('@status @type by @author', array('@status' => $status, '@type' => node_get_types('name', $node), '@author' => ($node->name ? $node->name : variable_get('anonymous', 'Anonymous')))) ."\n";
+ 
+        // Get author of most recent revision
+        $rev_author = "unknown";
+        $rev_author_query = 'SELECT u.name FROM {node_revisions} r INNER JOIN {node} n ON r.vid = n.vid INNER JOIN {users} u ON r.uid = u.uid WHERE n.nid = ' . $node->nid;
+        $rev_author_name = db_result(db_query($rev_author_query));
+        if ($rev_author_name) {
+          $rev_author = $rev_author_name;
+        }
+
+        // Print the revision author in the email message
+        if ($rev_author == "unknown") {
+          $node_body .= t('@status @type by @author', array('@status' => $status, '@type' => node_get_types('name', $node), '@author' => ($node->name ? $node->name : variable_get('anonymous', 'Anonymous')))) ."\n";
+        } 
+        else {
+          $node_body .= t('@status @type created by @author and edited by @rev_author', 
+            array('@status' => $status, 
+                  '@type' => node_get_types('name', $node),
+                  '@author' => ($node->name ? $node->name : variable_get('anonymous', 'Anonymous')), '@rev_author' => $rev_author)) . "\n";
+        }
         $node_body .= '[ '. url('node/'. $node->nid, NULL, NULL, TRUE) ." ]\n\n";
         $node_body .= _notify_content($node, $user) ."\n";
       }