Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 1662)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 1663)
@@ -47,4 +47,7 @@
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1933">#1933</a>] Placeholder
 			dialog will now display the placeholder value correctly in IE.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/957">#957</a>] Pressing Enter 
+			or typing after a placeholder with the placeholder plugin will no longer generate 
+			colored text.</li>
 	</ul>
 	<h3>
@@ -149,5 +152,5 @@
 			of depreciated "var").</li>
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1815">#1815</a>] PHP integration:
-			removed closing tag: "?>", so no additional whitespace added when files are included.</li>
+			removed closing tag: "?&gt;", so no additional whitespace added when files are included.</li>
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1906">#1906</a>] PHP file
 			browser: fixed problems with DetectHtml() function when open_basedir was set.</li>
Index: /FCKeditor/trunk/editor/_source/internals/fck_gecko.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fck_gecko.js	(revision 1662)
+++ /FCKeditor/trunk/editor/_source/internals/fck_gecko.js	(revision 1663)
@@ -105,5 +105,5 @@
 			// only perform the patched behavior if we're in an <a> tag, or the End key is pressed.
 			var parentTag = node.parentNode.tagName.toLowerCase() ;
-			if ( ! (  parentTag == 'a' ||
+			if ( ! (  parentTag == 'a' || String(node.parentNode.contentEditable) == 'false' ||
 					( ! ( FCKListsLib.BlockElements[parentTag] || FCKListsLib.NonEmptyBlockElements[parentTag] )
 					  && keyCode == 35 ) ) )