Index: fckeditor.popup.html
===================================================================
--- fckeditor.popup.html	(revision 394)
+++ fckeditor.popup.html	(working copy)
@@ -47,7 +47,7 @@
 		var t = text.indexOf('<!--break-->');
 		var textarea = window.opener.document.getElementById( FCKURLParams[ 'el' ] );
 		var teaser = window.opener.document.getElementById( FCKURLParams[ 'teaser' ] );
-		console.debug(teaser.parentNode.style.display);
+		//console.debug(teaser.parentNode.style.display);
 		// for now, do nothing when the body field is in joined mode
 		if(t != -1 && teaser.parentNode.style.display != 'none') {
 			teaser.value = FCKeditor_trim(text.slice(0,t));
Index: fckeditor.module
===================================================================
--- fckeditor.module	(revision 409)
+++ fckeditor.module	(working copy)
@@ -1185,7 +1185,12 @@
       if (!$processed) {
         drupal_add_js($module_drupal_path .'/fckeditor.popup.js');
       }
-      $element['#suffix'] .= " <span class=\"fckeditor_popuplink\">(<a href=\"#\" onclick=\"FCKeditor_OpenPopup('". $module_full_path ."/fckeditor.popup.html?var=". $js_id ."&el=". $element['#id'] ."');return false;\">". t('Open rich editor') ."</a>)</span>";
+      //$element['#suffix'] .= " <span class=\"fckeditor_popuplink\">(<a href=\"#\" onclick=\"FCKeditor_OpenPopup('". $module_full_path ."/fckeditor.popup.html?var=". $js_id ."&el=". $element['#id'] ."');return false;\">". t('Open rich editor') ."</a>)</span>";
+      $parms = "var=". $js_id ."&el=". $element['#id'];
+      if ($element['#id'] == 'edit-body') {
+      	$parms .= '&teaser=edit-teaser-js';
+      }
+      $element['#suffix'] .= " <span class=\"fckeditor_popuplink\">(<a href=\"#\" onclick=\"FCKeditor_OpenPopup('". $module_full_path ."/fckeditor.popup.html?". $parms ."');return false;\">". t('Open rich editor') ."</a>)</span>";
     }
     else {
       // if no popup mode, add the editor initialization to the footer