diff --git a/e107_plugins/tinymce/wysiwyg.php b/e107_plugins/tinymce/wysiwyg.php
index f1b35e1f0..0263cd3ee 100644
--- a/e107_plugins/tinymce/wysiwyg.php
+++ b/e107_plugins/tinymce/wysiwyg.php
@@ -261,11 +261,11 @@ class wysiwyg
 			
 	//		'theme_advanced_statusbar_location'	=> 'bottom',
 			'theme_advanced_resizing'			=> 'false',
-			'remove_linebreaks'					=> 'true',
+			'remove_linebreaks'					=> 'false',
 			'extended_valid_elements'			=> vartrue($config['extended_valid_elements']), 
 	//		'pagebreak_separator'				=> "[newpage]", 
-			'apply_source_formatting'			=> 'false',
-			'invalid_elements'					=> 'p,font,align,script,applet',
+			'apply_source_formatting'			=> 'true',
+			'invalid_elements'					=> 'font,align,script,applet',
 			'auto_cleanup_word'					=> 'true',
 			'cleanup'							=> 'true',
 			'convert_fonts_to_spans'			=> 'true',