diff --git a/e107_plugins/tinymce/plugins/e107bbcode/parser.php b/e107_plugins/tinymce/plugins/e107bbcode/parser.php
index b4fc2ac90..9618e28f8 100644
--- a/e107_plugins/tinymce/plugins/e107bbcode/parser.php
+++ b/e107_plugins/tinymce/plugins/e107bbcode/parser.php
@@ -17,7 +17,9 @@ if($_POST['mode'] == 'tohtml')
 {
 	$content = $tp->toDB($_POST['content']);
 	e107::getBB()->setClass($_SESSION['media_category']);
-	echo $tp->toHtml(str_replace("\n","",$content), true);
+	// XXX @Cam this breaks new lines, currently we use \n instead [br]
+	//echo $tp->toHtml(str_replace("\n","",$content), true);
+	echo $tp->toHtml($content, true);
 	e107::getBB()->clearClass();	
 }
 
diff --git a/e107_web/js/core/mediaManager.js b/e107_web/js/core/mediaManager.js
index f16792d28..836f9eaa2 100644
--- a/e107_web/js/core/mediaManager.js
+++ b/e107_web/js/core/mediaManager.js
@@ -36,6 +36,10 @@ $(document).ready(function()
 		
 		eMediaAttribute();	
 	});
+	$("#float").change(function () {  
+		
+		eMediaAttribute();	
+	});
 	
 	function eMediaAttribute(e)
 	{		
@@ -57,6 +61,7 @@ $(document).ready(function()
 		var margin_bottom 	= $('#margin-bottom').val();	
 		var margin_right 	= $('#margin-right').val();	
 		var margin_left 	= $('#margin-left').val();	
+		var _float 			= $('#float').val();	
 						
 		if(width !='')
 		{				
@@ -87,6 +92,11 @@ $(document).ready(function()
 		{				
 			style  = style + 'margin-bottom:' + margin_bottom + 'px;';	
 		}
+
+		if(_float =='left' || _float =='right')
+		{				
+			style  = style + 'float:' + _float + ';';	
+		}
 		
 		bb = '[img';