Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.467
diff -u -F^f -r1.467 node.module
--- modules/node.module	21 Feb 2005 19:47:44 -0000	1.467
+++ modules/node.module	24 Feb 2005 09:15:38 -0000
@@ -1489,19 +1489,9 @@ function node_preview($node) {
       $node->teaser = node_teaser($node->body);
     }
 
-    // Previewing alters $node so it needs to be cloned.
-    $edit = clone($node);
     // Display a preview of the node:
-    if ($node->teaser && $node->teaser != $node->body) {
-      $output = '<h3>'. t('Preview trimmed version') .'</h3>';
-      $output .= node_view($edit, 1, FALSE, 0);
-      $output .= '<p><em>'. t('The trimmed version of your post shows what your post looks like when promoted to the main page or when exported for syndication. You can insert the delimiter "&lt;!--break--&gt;" (without the quotes) to fine-tune where your post gets split.') .'</em></p>';
-      $output .= '<h3>'. t('Preview full version') .'</h3>';
-      $output .= node_view($edit, 0, FALSE, 0);
-    }
-    else {
-      $output .= node_view($edit, 0, FALSE, 0);
-    }
+    // Previewing alters $node so it needs to be cloned.
+    $output = theme('node_preview', clone($node));
 
     $output .= node_form($node);
 
@@ -1513,6 +1503,29 @@ function node_preview($node) {
 }
 
 /**
+ * Display a node preview for display during node creation and editing.
+ *
+ * @param $node
+ *   The node object which is being previewed.
+ */
+function theme_node_preview($node) {
+  $output = '<div class="preview">';
+  if ($node->teaser && $node->teaser != $node->body) {
+    $output .= '<h3>'. t('Preview trimmed version') .'</h3>';
+    $output .= node_view($node, 1, FALSE, 0);
+    $output .= '<p><em>'. t('The trimmed version of your post shows what your post looks like when promoted to the main page or when exported for syndication. You can insert the delimiter "&lt;!--break--&gt;" (without the quotes) to fine-tune where your post gets split.') .'</em></p>';
+    $output .= '<h3>'. t('Preview full version') .'</h3>';
+    $output .= node_view($node, 0, FALSE, 0);
+  }
+  else {
+    $output .= node_view($node, 0, FALSE, 0);
+  }
+  $output .= "</div>\n";
+
+  return $output;
+}
+
+/**
  * Accepts a submission of new or changed node content.
  *
  * @param $node