diff --git a/e107_handlers/bbcode_handler.php b/e107_handlers/bbcode_handler.php
index e34524364..b91f9ce04 100644
--- a/e107_handlers/bbcode_handler.php
+++ b/e107_handlers/bbcode_handler.php
@@ -594,6 +594,7 @@ class e_bbcode
 			array(	"\n",			'<br />'),
 		//	array(	"\n",			'<p>'),
 			array(	"[/list]",		'</ul>\n'),
+			array(	"[/list]",		'</ul>'),
 			array(	"[h=2]",		'<h2 class="bbcode-center" style="text-align: center;">'), // e107 bbcode markup
 			array(	"[h=2]",		'<h2>'),
 			array(	"[/h]",			'</h2>'),
diff --git a/e107_plugins/tinymce/plugins/e107bbcode/parser.php b/e107_plugins/tinymce/plugins/e107bbcode/parser.php
index ef5247028..b4fc2ac90 100644
--- a/e107_plugins/tinymce/plugins/e107bbcode/parser.php
+++ b/e107_plugins/tinymce/plugins/e107bbcode/parser.php
@@ -17,13 +17,13 @@ if($_POST['mode'] == 'tohtml')
 {
 	$content = $tp->toDB($_POST['content']);
 	e107::getBB()->setClass($_SESSION['media_category']);
-	echo $tp->toHtml($content, true);
+	echo $tp->toHtml(str_replace("\n","",$content), true);
 	e107::getBB()->clearClass();	
 }
 
 if($_POST['mode'] == 'tobbcode')
 {
-	// echo $_POST['content'];
+	 //echo $_POST['content'];
 	$content = stripslashes($_POST['content']);
 	echo e107::getBB()->htmltoBBcode($content);	
 }