Index: /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js	(revision 3662)
+++ /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js	(revision 3663)
@@ -175,4 +175,7 @@
 		init : function( editor )
 		{
+			var fixForBody = ( editor.config.enterMode != CKEDITOR.ENTER_BR )
+				? editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' : false;
+
 			editor.on( 'editingBlockReady', function()
 				{
@@ -433,6 +436,4 @@
 								if ( editor.dataProcessor )
 								{
-									var fixForBody = ( editor.config.enterMode != CKEDITOR.ENTER_BR )
-										? editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' : false;
 									data = editor.dataProcessor.toHtml( data, fixForBody );
 								}
@@ -486,5 +487,5 @@
 
 								if ( editor.dataProcessor )
-									data = editor.dataProcessor.toDataFormat( data, ( editor.config.enterMode != CKEDITOR.ENTER_BR ) );
+									data = editor.dataProcessor.toDataFormat( data, fixForBody );
 
 								// Strip the last blank paragraph within document.