diff -u excerpt-4.7.0/excerpt.module excerpt/excerpt.module
--- excerpt-4.7.0/excerpt.module	2005-12-30 17:33:21.000000000 +0000
+++ excerpt/excerpt.module	2006-07-18 14:45:30.000000000 +0100
@@ -13,13 +13,10 @@
 function excerpt_nodeapi(&$node, $op, $arg) {
   switch ($op) {
     case 'validate':
-      if (trim($node->teaser) == '') {
-        $node->teaser = node_teaser($node->body);
+      if ($node->teaser == '') {
+        form_set_value($arg['teaser'],isset($node->body) ? node_teaser($node->body, isset($node->format) ? $node->format : NULL) : '');
       }
       break;
-    case 'view':
-      $node->readmore = $node->teaser != $node->body;
-      break;
   }
 }
 
@@ -39,10 +36,15 @@
     }
     
     if ($form['type']['#value'] .'_node_form' == $form_id && variable_get('excerpt_options_'. $node->type, 1)) {
+      if ($node->teaser == node_teaser($node->body)) {
+        $default_value='';
+      } else {
+        $default_value=$node->teaser;
+      }
       $form['teaser'] = array(
         '#type' => 'textarea',
         '#title' => t('Teaser'),
-        '#default_value' => $node->teaser,
+        '#default_value' => $default_value,
         '#cols' => 60,
         '#rows' => 5,
         '#weight' => -17.5,