diff --git a/e107_web/js/core/all.jquery.js b/e107_web/js/core/all.jquery.js
index 94d4c36a3..ba13118fd 100644
--- a/e107_web/js/core/all.jquery.js
+++ b/e107_web/js/core/all.jquery.js
@@ -1206,12 +1206,15 @@ $(document).ready(function()
 				$(this).attr("target",'_blank');	
 			}					
 		});
-		
-		
-		
-	
-		
-		
+
+
+
+
+
+	// Store selected textarea.
+	$('.tbox.bbarea').click(function() {
+		storeCaret(this);
+	});
 		
 			
 		
@@ -1444,6 +1447,8 @@ function SyncWithServerTime(serverTime, path, domain)
 	var res = window.screen.width + "x" + window.screen.height;
 	var eself = document.location;
 
+var e107_selectedInputArea;
+
 /* TODO: @SecretR - Object of removal
 // From http://phpbb.com
 var clientPC = navigator.userAgent.toLowerCase();
diff --git a/e107_web/js/core/mediaManager.js b/e107_web/js/core/mediaManager.js
index 50d4b1403..17f0070f0 100644
--- a/e107_web/js/core/mediaManager.js
+++ b/e107_web/js/core/mediaManager.js
@@ -36,6 +36,8 @@ $(document).ready(function()
 		var _float 			= $('#float').val();
 		var alt             = $('#alt').val();
 
+		var target 		    = $(e).attr('data-target');
+
 
         if(margin_right !='' && margin_right !== undefined)
 		{				
@@ -105,7 +107,31 @@ $(document).ready(function()
 			bb = bb + ']';
 			bb = bb + path;
 			bb = bb + '[/img]';
-			$('#bbcode_holder').val(bb); // Set the BBcode Value. 
+
+			if(target && target.charAt(0) != "#" && target.charAt(0) != ".")
+			{
+				target = "#" + target;
+			}
+
+			var $target = $(target);
+
+			if($target.length > 0)
+			{
+				$target.val($target.val() + bb);
+			}
+			else
+			{
+				var $parentTarget = parent.$(target); // From iframe.
+
+				if($parentTarget.length > 0)
+				{
+					$parentTarget.val($parentTarget.val() + bb);
+				}
+				else
+				{
+					$('#bbcode_holder').val(bb); // Set the BBcode Value.
+				}
+			}
 		}