Index: /FCKeditor/trunk/editor/_source/internals/fckxhtml.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fckxhtml.js	(revision 167)
+++ /FCKeditor/trunk/editor/_source/internals/fckxhtml.js	(revision 168)
@@ -125,7 +125,7 @@
 {
 	// Trim block elements. This is also needed to avoid Firefox leaving extra
-	// BRs at the end of them (check made inside _AppendNode).
+	// BRs at the end of them.
 	if ( isBlockElement )
-		FCKDomTools.TrimNode( htmlNode ) ;
+		FCKDomTools.TrimNode( htmlNode, true ) ;
 
 	var iCount = 0 ;
@@ -209,6 +209,6 @@
 				return false ;
 
-			// Remove the <br> if it is a bogus node or is the last child.
-			if ( sNodeName == 'br' && ( htmlNode.getAttribute( 'type', 2 ) == '_moz' || !htmlNode.nextSibling ) )
+			// Remove the <br> if it is a bogus node.
+			if ( sNodeName == 'br' && htmlNode.getAttribute( 'type', 2 ) == '_moz' )
 				return false ;
 
