--- modules/node/node.module.1.947.2.2	Tue Feb 26 15:04:00 2008
+++ modules/node/node.module	Fri Apr 04 00:23:09 2008
@@ -1029,10 +1029,10 @@ function node_view($node, $teaser = FALS
  * Apply filters and build the node's standard elements.
  */
 function node_prepare($node, $teaser = FALSE) {
-  // First we'll overwrite the existing node teaser and body with
-  // the filtered copies! Then, we'll stick those into the content
-  // array and set the read more flag if appropriate.
-  $node->readmore = $node->teaser != $node->body;
+  // First we'll set the read more flag if appropriate. Then, we'll overwrite
+  // the existing node teaser or body with the filtered copy and stick this
+  // into the content array. 
+  $node->readmore = trim($node->body) && (trim($node->teaser) != trim($node->body));
 
   if ($teaser == FALSE) {
     $node->body = check_markup($node->body, $node->format, FALSE);