diff --git a/src/Orchard.Web/Modules/Markdown/ResourceManifest.cs b/src/Orchard.Web/Modules/Markdown/ResourceManifest.cs
index 03f0542f2..a966e1180 100644
--- a/src/Orchard.Web/Modules/Markdown/ResourceManifest.cs
+++ b/src/Orchard.Web/Modules/Markdown/ResourceManifest.cs
@@ -11,6 +11,9 @@ namespace Markdown {
 
             manifest.DefineScript("OrchardMarkdown").SetUrl("orchard-markdown.min.js", "orchard-markdown.js").SetDependencies("Resizer", "Markdown_Editor");
             manifest.DefineStyle("OrchardMarkdown").SetUrl("admin-markdown.css");
+
+            manifest.DefineScript("OrchardMarkdown-MediaPicker").SetUrl("orchard-markdown-media-picker.min.js", "orchard-markdown-media-picker.js");
+            manifest.DefineScript("OrchardMarkdown-MediaLibrary").SetUrl("orchard-markdown-media-library.min.js", "orchard-markdown-media-library.js");
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-library.js b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-library.js
new file mode 100644
index 000000000..a5255e97c
--- /dev/null
+++ b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-library.js
@@ -0,0 +1,75 @@
+(function() {
+    var converter = Markdown.getSanitizingConverter();
+    var editors = $('.wmd-input');
+
+    editors.each(function() {
+
+        var idPostfix = $(this).attr('id').substr('wmd-input'.length);
+
+        var editor = new Markdown.Editor(converter, idPostfix, {
+            handler: function() { window.open("http://daringfireball.net/projects/markdown/syntax"); }
+        });
+
+        editor.hooks.set("insertImageDialog", function(callback) {
+            // see if there's an image selected that they intend on editing
+            var wmd = $('#wmd-input' + idPostfix);
+
+            var editImage, content = wmd.selection ? wmd.selection.createRange().text : null;
+            var adminIndex = location.href.toLowerCase().indexOf("/admin/");
+            if (adminIndex === -1) return;
+            var url = location.href.substr(0, adminIndex) + "/Admin/Orchard.MediaLibrary?dialog=true";
+            $.colorbox({
+                href: url,
+                iframe: true,
+                reposition: true,
+                width: "90%",
+                height: "90%",
+                onLoad: function () {
+                    // hide the scrollbars from the main window
+                    $('html, body').css('overflow', 'hidden');
+                },
+                onClosed: function () {
+                    $('html, body').css('overflow', '');
+
+                    var selectedData = $.colorbox.selectedData;
+
+                    if (selectedData == null) // Dialog cancelled, do nothing
+                        return;
+
+                    var newContent = '';
+                    for (var i = 0; i < selectedData.length; i++) {
+                        var renderMedia = location.href.substr(0, adminIndex) + "/Admin/Orchard.MediaLibrary/MediaItem/" + selectedData[i].id + "?displayType=Raw";
+                        $.ajax({
+                            async: false,
+                            type: 'GET',
+                            url: renderMedia,
+                            success: function (data) {
+                                newContent += data;
+                            }
+                        });
+                    }
+
+                    var result = $.parseHTML(newContent);
+                    var img = $(result).filter('img');
+                    // if this is an image, use the callback which will format it in markdown
+                    if (img.length > 0 && img.attr('src')) {
+                        callback(img.attr('src'));
+                    }
+                    
+                    // otherwise, insert the raw HTML
+                    else {
+                        if (wmd.selection) {
+                            wmd.selection.replace('.*', newContent);
+                        } else {
+                            wmd.text(newContent);
+                        }
+                        callback();
+                    }
+                }
+            });
+            return true;
+        });
+
+        editor.run();
+    });
+})();
diff --git a/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-library.min.js b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-library.min.js
new file mode 100644
index 000000000..98b7de205
--- /dev/null
+++ b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-library.min.js
@@ -0,0 +1,2 @@
+(function(){var n=Markdown.getSanitizingConverter(),t=$(".wmd-input");t.each(function(){var t=$(this).attr("id").substr("wmd-input".length),i=new Markdown.Editor(n,t,{handler:function(){window.open("http://daringfireball.net/projects/markdown/syntax")}});i.hooks.set("insertImageDialog",function(n){var i=$("#wmd-input"+t),f=i.selection?i.selection.createRange().text:null,r=location.href.toLowerCase().indexOf("/admin/"),u;if(r!==-1)return u=location.href.substr(0,r)+"/Admin/Orchard.MediaLibrary?dialog=true",$.colorbox({href:u,iframe:!0,reposition:!0,width:"90%",height:"90%",onLoad:function(){$("html, body").css("overflow","hidden")},onClosed:function(){var u,t,f,o,s,e;if($("html, body").css("overflow",""),u=$.colorbox.selectedData,u!=null){for(t="",f=0;f<u.length;f++)o=location.href.substr(0,r)+"/Admin/Orchard.MediaLibrary/MediaItem/"+u[f].id+"?displayType=Raw",$.ajax({async:!1,type:"GET",url:o,success:function(n){t+=n}});s=$.parseHTML(t),e=$(s).filter("img"),e.length>0&&e.attr("src")?n(e.attr("src")):(i.selection?i.selection.replace(".*",t):i.text(t),n())}}}),!0}),i.run()})})();
+//@ sourceMappingURL=orchard-markdown-media-library.min.js.map
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-library.min.js.map b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-library.min.js.map
new file mode 100644
index 000000000..343b77b5f
--- /dev/null
+++ b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-library.min.js.map
@@ -0,0 +1,8 @@
+{
+"version":3,
+"file":"orchard-markdown-media-library.min.js",
+"lineCount":1,
+"mappings":"CAAC,QAAQ,CAAA,CAAG,CACR,IAAIA,EAAYC,QAAQC,uBAAuB,CAAA,EAC3CC,EAAUC,CAAC,CAAC,YAAD,CADkC,CAGjDD,CAAOE,KAAK,CAAC,QAAQ,CAAA,CAAG,CAEpB,IAAIC,EAAYF,CAAC,CAAC,IAAD,CAAMG,KAAK,CAAC,IAAD,CAAMC,OAAO,CAAC,WAAWC,OAAZ,EAErCC,EAAS,IAAIT,QAAQU,OAAO,CAACX,CAAS,CAAEM,CAAS,CAAE,CACnD,OAAO,CAAEM,QAAQ,CAAA,CAAG,CAAEC,MAAMC,KAAK,CAAC,oDAAD,CAAb,CAD+B,CAAvB,CAF6B,CAM7DJ,CAAMK,MAAMC,IAAI,CAAC,mBAAmB,CAAE,QAAQ,CAACC,CAAD,CAAW,CAErD,IAAIC,EAAMd,CAAC,CAAC,YAAa,CAAEE,CAAhB,EAEIa,EAAUD,CAAGE,UAAW,CAAEF,CAAGE,UAAUC,YAAY,CAAA,CAAEC,KAAM,CAAE,KACxEC,EAAaC,QAAQC,KAAKC,YAAY,CAAA,CAAEC,QAAQ,CAAC,SAAD,EAEhDC,CALiC,C,GAIjCL,CAAW,GAAI,G,OACfK,CAAI,CAAEJ,QAAQC,KAAKjB,OAAO,CAAC,CAAC,CAAEe,CAAJ,CAAgB,CAAE,yC,CAChDnB,CAACyB,SAAS,CAAC,CACP,IAAI,CAAED,CAAG,CACT,MAAM,CAAE,CAAA,CAAI,CACZ,UAAU,CAAE,CAAA,CAAI,CAChB,KAAK,CAAE,KAAK,CACZ,MAAM,CAAE,KAAK,CACb,MAAM,CAAEE,QAAS,CAAA,CAAG,CAEhB1B,CAAC,CAAC,YAAD,CAAc2B,IAAI,CAAC,UAAU,CAAE,QAAb,CAFH,CAGnB,CACD,QAAQ,CAAEC,QAAS,CAAA,CAAG,CAGlB,IAAIC,EAKAC,EACKC,EACDC,EAWJC,EACAC,CAnBsC,CAE1C,GAJAlC,CAAC,CAAC,YAAD,CAAc2B,IAAI,CAAC,UAAU,CAAE,EAAb,CAAgB,CAE/BE,CAAa,CAAE7B,CAACyB,SAASI,a,CAEzBA,CAAa,EAAG,KAChB,CAGJ,IADIC,CAAW,CAAE,E,CACRC,CAAE,CAAE,CAAC,CAAEA,CAAE,CAAEF,CAAYxB,OAAO,CAAE0B,CAAC,EAA1C,CACQC,CAAY,CAAEZ,QAAQC,KAAKjB,OAAO,CAAC,CAAC,CAAEe,CAAJ,CAAgB,CAAE,wCAAyC,CAAEU,CAAa,CAAAE,CAAA,CAAEI,GAAI,CAAE,kB,CACxHnC,CAACoC,KAAK,CAAC,CACH,KAAK,CAAE,CAAA,CAAK,CACZ,IAAI,CAAE,KAAK,CACX,GAAG,CAAEJ,CAAW,CAChB,OAAO,CAAEK,QAAS,CAACC,CAAD,CAAO,CACrBR,CAAW,EAAGQ,CADO,CAJtB,CAAD,CAQV,CAEIL,CAAO,CAAEjC,CAACuC,UAAU,CAACT,CAAD,C,CACpBI,CAAI,CAAElC,CAAC,CAACiC,CAAD,CAAQO,OAAO,CAAC,KAAD,C,CAEtBN,CAAG7B,OAAQ,CAAE,CAAE,EAAG6B,CAAG/B,KAAK,CAAC,KAAD,CAA9B,CACIU,CAAQ,CAACqB,CAAG/B,KAAK,CAAC,KAAD,CAAT,CADZ,EAMQW,CAAGE,UAAP,CACIF,CAAGE,UAAUyB,QAAQ,CAAC,IAAI,CAAEX,CAAP,CADzB,CAGIhB,CAAGI,KAAK,CAACY,CAAD,C,CAEZjB,CAAQ,CAAA,EA7BR,CANc,CAVf,CAAD,CAgDR,CACK,CAAA,CAzD8C,CAAzC,CA0Dd,CAEFP,CAAMoC,IAAI,CAAA,CApEU,CAAZ,CAJJ,EA0EV,CAAA,CAAE",
+"sources":["orchard-markdown-media-library.js"],
+"names":["converter","Markdown","getSanitizingConverter","editors","$","each","idPostfix","attr","substr","length","editor","Editor","handler","window","open","hooks","set","callback","wmd","content","selection","createRange","text","adminIndex","location","href","toLowerCase","indexOf","url","colorbox","onLoad","css","onClosed","selectedData","newContent","i","renderMedia","result","img","id","ajax","success","data","parseHTML","filter","replace","run"]
+}
diff --git a/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-picker.js b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-picker.js
new file mode 100644
index 000000000..84019bf85
--- /dev/null
+++ b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-picker.js
@@ -0,0 +1,47 @@
+(function() {
+    var converter = Markdown.getSanitizingConverter();
+    var editors = $('.wmd-input');
+
+    editors.each(function() {
+
+        var idPostfix = $(this).attr('id').substr('wmd-input'.length);
+
+        var editor = new Markdown.Editor(converter, idPostfix, {
+            handler: function() { window.open("http://daringfireball.net/projects/markdown/syntax"); }
+        });
+
+        editor.hooks.set("insertImageDialog", function(callback) {
+            // see if there's an image selected that they intend on editing
+            var wmd = $('#wmd-input' + idPostfix);
+
+            var editImage, content = wmd.selection ? wmd.selection.createRange().text : null;
+            if (content) {
+                // replace <img> with <editimg>, so we can easily use jquery to get the 'src' without it
+                // being resolved by the browser (e.g. prevent '/foo.png' becoming 'http://localhost:12345/orchardlocal/foo.png').
+                content = content.replace(/\<IMG/gi, "<editimg");
+                var firstImg = $(content).filter("editimg");
+                if (firstImg.length) {
+                    editImage = {
+                        src: firstImg.attr("src"),
+                        "class": firstImg.attr("class"),
+                        style: firstImg.css("cssText"),
+                        alt: firstImg.attr("alt"),
+                        width: firstImg.attr("width"),
+                        height: firstImg.attr("height"),
+                        align: firstImg.attr("align")
+                    };
+                }
+            }
+            wmd.trigger("orchard-admin-pickimage-open", {
+                img: editImage,
+                uploadMediaPath: wmd.data("mediapicker-uploadpath"),
+                callback: function(data) {
+                    callback(data.img.src);
+                }
+            });
+            return true;
+        });
+
+        editor.run();
+    });
+})();
diff --git a/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-picker.min.js b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-picker.min.js
new file mode 100644
index 000000000..6d0ea800f
--- /dev/null
+++ b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-picker.min.js
@@ -0,0 +1,2 @@
+(function(){var n=Markdown.getSanitizingConverter(),t=$(".wmd-input");t.each(function(){var t=$(this).attr("id").substr("wmd-input".length),i=new Markdown.Editor(n,t,{handler:function(){window.open("http://daringfireball.net/projects/markdown/syntax")}});i.hooks.set("insertImageDialog",function(n){var r=$("#wmd-input"+t),f,u=r.selection?r.selection.createRange().text:null,i;return u&&(u=u.replace(/\<IMG/gi,"<editimg"),i=$(u).filter("editimg"),i.length&&(f={src:i.attr("src"),"class":i.attr("class"),style:i.css("cssText"),alt:i.attr("alt"),width:i.attr("width"),height:i.attr("height"),align:i.attr("align")})),r.trigger("orchard-admin-pickimage-open",{img:f,uploadMediaPath:r.data("mediapicker-uploadpath"),callback:function(t){n(t.img.src)}}),!0}),i.run()})})();
+//@ sourceMappingURL=orchard-markdown-media-picker.min.js.map
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-picker.min.js.map b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-picker.min.js.map
new file mode 100644
index 000000000..d243970c2
--- /dev/null
+++ b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown-media-picker.min.js.map
@@ -0,0 +1,8 @@
+{
+"version":3,
+"file":"orchard-markdown-media-picker.min.js",
+"lineCount":1,
+"mappings":"CAAC,QAAQ,CAAA,CAAG,CACR,IAAIA,EAAYC,QAAQC,uBAAuB,CAAA,EAC3CC,EAAUC,CAAC,CAAC,YAAD,CADkC,CAGjDD,CAAOE,KAAK,CAAC,QAAQ,CAAA,CAAG,CAEpB,IAAIC,EAAYF,CAAC,CAAC,IAAD,CAAMG,KAAK,CAAC,IAAD,CAAMC,OAAO,CAAC,WAAWC,OAAZ,EAErCC,EAAS,IAAIT,QAAQU,OAAO,CAACX,CAAS,CAAEM,CAAS,CAAE,CACnD,OAAO,CAAEM,QAAQ,CAAA,CAAG,CAAEC,MAAMC,KAAK,CAAC,oDAAD,CAAb,CAD+B,CAAvB,CAF6B,CAM7DJ,CAAMK,MAAMC,IAAI,CAAC,mBAAmB,CAAE,QAAQ,CAACC,CAAD,CAAW,CAErD,IAAIC,EAAMd,CAAC,CAAC,YAAa,CAAEE,CAAhB,EAEPa,EAAWC,EAAUF,CAAGG,UAAW,CAAEH,CAAGG,UAAUC,YAAY,CAAA,CAAEC,KAAM,CAAE,KAKpEC,CAP6B,CA2BrC,OAxBIJ,C,GAGAA,CAAQ,CAAEA,CAAOK,QAAQ,CAAC,SAAS,CAAE,UAAZ,CAAuB,CAC5CD,CAAS,CAAEpB,CAAC,CAACgB,CAAD,CAASM,OAAO,CAAC,SAAD,C,CAC5BF,CAAQf,O,GACRU,CAAU,CAAE,CACR,GAAG,CAAEK,CAAQjB,KAAK,CAAC,KAAD,CAAO,CACzB,OAAO,CAAEiB,CAAQjB,KAAK,CAAC,OAAD,CAAS,CAC/B,KAAK,CAAEiB,CAAQG,IAAI,CAAC,SAAD,CAAW,CAC9B,GAAG,CAAEH,CAAQjB,KAAK,CAAC,KAAD,CAAO,CACzB,KAAK,CAAEiB,CAAQjB,KAAK,CAAC,OAAD,CAAS,CAC7B,MAAM,CAAEiB,CAAQjB,KAAK,CAAC,QAAD,CAAU,CAC/B,KAAK,CAAEiB,CAAQjB,KAAK,CAAC,OAAD,CAPZ,GAQX,CAGTW,CAAGU,QAAQ,CAAC,8BAA8B,CAAE,CACxC,GAAG,CAAET,CAAS,CACd,eAAe,CAAED,CAAGW,KAAK,CAAC,wBAAD,CAA0B,CACnD,QAAQ,CAAEZ,QAAQ,CAACY,CAAD,CAAO,CACrBZ,CAAQ,CAACY,CAAIC,IAAIC,IAAT,CADa,CAHe,CAAjC,CAMT,CACK,CAAA,CA7B8C,CAAzC,CA8Bd,CAEFrB,CAAMsB,IAAI,CAAA,CAxCU,CAAZ,CAJJ,EA8CV,CAAA,CAAE",
+"sources":["orchard-markdown-media-picker.js"],
+"names":["converter","Markdown","getSanitizingConverter","editors","$","each","idPostfix","attr","substr","length","editor","Editor","handler","window","open","hooks","set","callback","wmd","editImage","content","selection","createRange","text","firstImg","replace","filter","css","trigger","data","img","src","run"]
+}
diff --git a/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown.js b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown.js
index 38ba3ab63..eeedaf89a 100644
--- a/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown.js
+++ b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown.js
@@ -1,52 +1,4 @@
 (function() {
-    var marker = '<!-- markdown -->';
-    var converter = Markdown.getSanitizingConverter();
-
-    var editors = $('.wmd-input');
-
-    editors.each(function() {
-
-        var idPostfix = $(this).attr('id').substr('wmd-input'.length);
-
-        var editor = new Markdown.Editor(converter, idPostfix, {
-            handler: function() { window.open("http://daringfireball.net/projects/markdown/syntax"); }
-        });
-
-        editor.hooks.set("insertImageDialog", function(callback) {
-            // see if there's an image selected that they intend on editing
-            var wmd = $('#wmd-input' + idPostfix);
-
-            var editImage, content = wmd.selection ? wmd.selection.createRange().text : null;
-            if (content) {
-                // replace <img> with <editimg>, so we can easily use jquery to get the 'src' without it
-                // being resolved by the browser (e.g. prevent '/foo.png' becoming 'http://localhost:12345/orchardlocal/foo.png').
-                content = content.replace(/\<IMG/gi, "<editimg");
-                var firstImg = $(content).filter("editimg");
-                if (firstImg.length) {
-                    editImage = {
-                        src: firstImg.attr("src"),
-                        "class": firstImg.attr("class"),
-                        style: firstImg.css("cssText"),
-                        alt: firstImg.attr("alt"),
-                        width: firstImg.attr("width"),
-                        height: firstImg.attr("height"),
-                        align: firstImg.attr("align")
-                    };
-                }
-            }
-            wmd.trigger("orchard-admin-pickimage-open", {
-                img: editImage,
-                uploadMediaPath: wmd.data("mediapicker-uploadpath"),
-                callback: function(data) {
-                    callback(data.img.src);
-                }
-            });
-            return true;
-        });
-
-        editor.run();
-    });
-
     var resizableSelector = ".wmd-input,.wmd-preview",
         resizeInnerElements = function (el, size) {
             if (size > 120) {
diff --git a/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown.min.js b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown.min.js
index 5b07cf75f..abc0641d6 100644
--- a/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown.min.js
+++ b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown.min.js
@@ -1,2 +1,2 @@
-(function(){var i=Markdown.getSanitizingConverter(),r=$(".wmd-input"),n,t;r.each(function(){var n=$(this).attr("id").substr("wmd-input".length),t=new Markdown.Editor(i,n,{handler:function(){window.open("http://daringfireball.net/projects/markdown/syntax")}});t.hooks.set("insertImageDialog",function(t){var r=$("#wmd-input"+n),f,u=r.selection?r.selection.createRange().text:null,i;return u&&(u=u.replace(/\<IMG/gi,"<editimg"),i=$(u).filter("editimg"),i.length&&(f={src:i.attr("src"),"class":i.attr("class"),style:i.css("cssText"),alt:i.attr("alt"),width:i.attr("width"),height:i.attr("height"),align:i.attr("align")})),r.trigger("orchard-admin-pickimage-open",{img:f,uploadMediaPath:r.data("mediapicker-uploadpath"),callback:function(n){t(n.img.src)}}),!0}),t.run()}),n=".wmd-input,.wmd-preview",t=function(n,t){t>120&&n.height(t-20)},t($(n),400),$(".has-grip").TextAreaResizer(function(i,r){r.find(n).each(function(){t($(this),i-18)})},{resizeWrapper:!0})})();
+(function(){var n=".wmd-input,.wmd-preview",t=function(n,t){t>120&&n.height(t-20)};t($(n),400),$(".has-grip").TextAreaResizer(function(i,r){r.find(n).each(function(){t($(this),i-18)})},{resizeWrapper:!0})})();
 //@ sourceMappingURL=orchard-markdown.min.js.map
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown.min.js.map b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown.min.js.map
index cac89c4b3..0dad72bcd 100644
--- a/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown.min.js.map
+++ b/src/Orchard.Web/Modules/Markdown/Scripts/orchard-markdown.min.js.map
@@ -2,7 +2,7 @@
 "version":3,
 "file":"orchard-markdown.min.js",
 "lineCount":1,
-"mappings":"CAAC,QAAQ,CAAA,CAAG,CACR,IACIA,EAAYC,QAAQC,uBAAuB,CAAA,EAE3CC,EAAUC,CAAC,CAAC,YAAD,EA6CXC,EACAC,CAjD4B,CAKhCH,CAAOI,KAAK,CAAC,QAAQ,CAAA,CAAG,CAEpB,IAAIC,EAAYJ,CAAC,CAAC,IAAD,CAAMK,KAAK,CAAC,IAAD,CAAMC,OAAO,CAAC,WAAWC,OAAZ,EAErCC,EAAS,IAAIX,QAAQY,OAAO,CAACb,CAAS,CAAEQ,CAAS,CAAE,CACnD,OAAO,CAAEM,QAAQ,CAAA,CAAG,CAAEC,MAAMC,KAAK,CAAC,oDAAD,CAAb,CAD+B,CAAvB,CAF6B,CAM7DJ,CAAMK,MAAMC,IAAI,CAAC,mBAAmB,CAAE,QAAQ,CAACC,CAAD,CAAW,CAErD,IAAIC,EAAMhB,CAAC,CAAC,YAAa,CAAEI,CAAhB,EAEPa,EAAWC,EAAUF,CAAGG,UAAW,CAAEH,CAAGG,UAAUC,YAAY,CAAA,CAAEC,KAAM,CAAE,KAKpEC,CAP6B,CA2BrC,OAxBIJ,C,GAGAA,CAAQ,CAAEA,CAAOK,QAAQ,CAAC,SAAS,CAAE,UAAZ,CAAuB,CAC5CD,CAAS,CAAEtB,CAAC,CAACkB,CAAD,CAASM,OAAO,CAAC,SAAD,C,CAC5BF,CAAQf,O,GACRU,CAAU,CAAE,CACR,GAAG,CAAEK,CAAQjB,KAAK,CAAC,KAAD,CAAO,CACzB,OAAO,CAAEiB,CAAQjB,KAAK,CAAC,OAAD,CAAS,CAC/B,KAAK,CAAEiB,CAAQG,IAAI,CAAC,SAAD,CAAW,CAC9B,GAAG,CAAEH,CAAQjB,KAAK,CAAC,KAAD,CAAO,CACzB,KAAK,CAAEiB,CAAQjB,KAAK,CAAC,OAAD,CAAS,CAC7B,MAAM,CAAEiB,CAAQjB,KAAK,CAAC,QAAD,CAAU,CAC/B,KAAK,CAAEiB,CAAQjB,KAAK,CAAC,OAAD,CAPZ,GAQX,CAGTW,CAAGU,QAAQ,CAAC,8BAA8B,CAAE,CACxC,GAAG,CAAET,CAAS,CACd,eAAe,CAAED,CAAGW,KAAK,CAAC,wBAAD,CAA0B,CACnD,QAAQ,CAAEZ,QAAQ,CAACY,CAAD,CAAO,CACrBZ,CAAQ,CAACY,CAAIC,IAAIC,IAAT,CADa,CAHe,CAAjC,CAMT,CACK,CAAA,CA7B8C,CAAzC,CA8Bd,CAEFrB,CAAMsB,IAAI,CAAA,CAxCU,CAAZ,CAyCV,CAEE7B,CAAkB,CAAE,yB,CACpBC,CAAoB,CAAEA,QAAS,CAAC6B,CAAE,CAAEC,CAAL,CAAW,CAClCA,CAAK,CAAE,G,EACPD,CAAEE,OAAO,CAACD,CAAK,CAAE,EAAR,CAFyB,C,CAK9C9B,CAAmB,CAACF,CAAC,CAACC,CAAD,CAAmB,CAAE,GAAvB,CAA2B,CAE9CD,CAAC,CAAC,WAAD,CAAakC,gBAAgB,CAAC,QAAQ,CAACF,CAAI,CAAEG,CAAP,CAAiB,CACpDA,CAAQC,KAAK,CAACnC,CAAD,CAAmBE,KAAK,CAAC,QAAQ,CAAA,CAAG,CAAED,CAAmB,CAACF,CAAC,CAAC,IAAD,CAAM,CAAEgC,CAAK,CAAE,EAAjB,CAArB,CAAZ,CADe,CAEvD,CAAE,CACC,aAAa,CAAE,CAAA,CADhB,CAF2B,CAzDtB,EA8DV,CAAA,CAAE",
+"mappings":"CAAC,QAAQ,CAAA,CAAG,CACR,IAAIA,EAAoB,0BACpBC,EAAsBA,QAAS,CAACC,CAAE,CAAEC,CAAL,CAAW,CAClCA,CAAK,CAAE,G,EACPD,CAAEE,OAAO,CAACD,CAAK,CAAE,EAAR,CAFyB,CAIzC,CACLF,CAAmB,CAACI,CAAC,CAACL,CAAD,CAAmB,CAAE,GAAvB,CAA2B,CAE9CK,CAAC,CAAC,WAAD,CAAaC,gBAAgB,CAAC,QAAQ,CAACH,CAAI,CAAEI,CAAP,CAAiB,CACpDA,CAAQC,KAAK,CAACR,CAAD,CAAmBS,KAAK,CAAC,QAAQ,CAAA,CAAG,CAAER,CAAmB,CAACI,CAAC,CAAC,IAAD,CAAM,CAAEF,CAAK,CAAE,EAAjB,CAArB,CAAZ,CADe,CAEvD,CAAE,CACC,aAAa,CAAE,CAAA,CADhB,CAF2B,CATtB,EAcV,CAAA,CAAE",
 "sources":["orchard-markdown.js"],
-"names":["converter","Markdown","getSanitizingConverter","editors","$","resizableSelector","resizeInnerElements","each","idPostfix","attr","substr","length","editor","Editor","handler","window","open","hooks","set","callback","wmd","editImage","content","selection","createRange","text","firstImg","replace","filter","css","trigger","data","img","src","run","el","size","height","TextAreaResizer","resizing","find"]
+"names":["resizableSelector","resizeInnerElements","el","size","height","$","TextAreaResizer","resizing","find","each"]
 }
diff --git a/src/Orchard.Web/Modules/Markdown/Styles/admin-markdown.css b/src/Orchard.Web/Modules/Markdown/Styles/admin-markdown.css
index 3d0e45481..16d655ed9 100644
--- a/src/Orchard.Web/Modules/Markdown/Styles/admin-markdown.css
+++ b/src/Orchard.Web/Modules/Markdown/Styles/admin-markdown.css
@@ -45,6 +45,7 @@
     display: table;
     position: relative;
     height: 400px;
+    width: 99%;
 }
 .wmd-innerbox {
     height: 100%;
diff --git a/src/Orchard.Web/Modules/Markdown/Views/Body-Markdown.Editor.cshtml b/src/Orchard.Web/Modules/Markdown/Views/Body-Markdown.Editor.cshtml
index 46ae286d2..41a0d7811 100644
--- a/src/Orchard.Web/Modules/Markdown/Views/Body-Markdown.Editor.cshtml
+++ b/src/Orchard.Web/Modules/Markdown/Views/Body-Markdown.Editor.cshtml
@@ -1,8 +1,25 @@
-@{ 
+@using Orchard.Environment.Descriptor.Models
+
+@{
     Script.Require("OrchardMarkdown");
     Style.Require("OrchardMarkdown");
-    string idPostfix = @Html.FieldIdFor(m => m);
+
+    string idPostfix = Html.FieldIdFor(m => m);
+
+    var shellDescriptor = WorkContext.Resolve<ShellDescriptor>();
+    var mediaLibraryEnabled = shellDescriptor.Features.Any(x => x.Name == "Orchard.MediaLibrary");
+
+    if (mediaLibraryEnabled) {
+        Script.Require("jQueryColorBox");
+        Script.Require("OrchardMarkdown-MediaLibrary");
+        Style.Require("jQueryColorBox");
+    }
+    else {
+        Script.Require("OrchardMarkdown-MediaPicker");
+    }
+
 }
+
 <div class="wmd-box has-grip">
     <div class="wmd-innerbox">
         <div class="wmd-editor-box">
diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/editor_plugin.js b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/editor_plugin.js
index 6ee567500..a8e5e34f5 100644
--- a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/editor_plugin.js
+++ b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/editor_plugin.js
@@ -1,2 +1,2 @@
-(function(){tinymce.create("tinymce.plugins.Orchard.MediaPicker",{init:function(b,d){b.addCommand("mceMediaPicker",function(){b.focus();var c,a=b.selection.getContent();a&&(a=a.replace(/\<IMG/gi,"<editimg"),a=$(a).filter("editimg"),a.length&&(c={src:a.attr("src"),"class":a.attr("class"),style:a.css("cssText"),alt:a.attr("alt"),width:a.attr("width"),height:a.attr("height"),align:a.attr("align")}));jQuery("#"+b.id).trigger("orchard-admin-pickimage-open",{img:c,uploadMediaPath:jQuery("#"+b.id).data("mediapicker-uploadpath"),
-callback:function(a){b.focus();b.selection.setContent(a.img.html)}})});b.addButton("mediapicker",{title:jQuery("#"+b.id).data("mediapicker-title"),cmd:"mceMediaPicker",image:d+"/img/picture_add.png"})},createControl:function(){return null},getInfo:function(){return{longname:"Orchard MediaPicker Plugin",author:"Dave Reed",authorurl:"http://orchardproject.net",infourl:"http://orchardproject.net",version:"1.1"}}});tinymce.PluginManager.add("mediapicker",tinymce.plugins.Orchard.MediaPicker)})();
\ No newline at end of file
+(function () { tinymce.create("tinymce.plugins.Orchard.MediaLibrary", { init: function (n, t) { n.addCommand("mceMediaLibrary", function () { var t, i; (n.focus(), t = location.href.toLowerCase().indexOf("/admin/"), t !== -1) && (i = location.href.substr(0, t) + "/Admin/Orchard.MediaLibrary?dialog=true", $.colorbox({ href: i, iframe: !0, reposition: !0, width: "90%", height: "90%", onLoad: function () { $("html, body").css("overflow", "hidden") }, onClosed: function () { var n, r, i, u; if ($("html, body").css("overflow", ""), n = $.colorbox.selectedData, n != null) { for (r = "", i = 0; i < n.length; i++) u = location.href.substr(0, t) + "/Admin/Orchard.MediaLibrary/MediaItem/" + n[i].id + "?displayType=Raw", $.ajax({ async: !1, type: "GET", url: u, success: function (n) { r += n } }); tinyMCE.execCommand("mceReplaceContent", !1, r) } } })) }), n.addButton("medialibrary", { title: "Insert Media Item", cmd: "mceMediaLibrary", image: t + "/img/picture_add.png" }) }, createControl: function () { return null }, getInfo: function () { return { longname: "Orchard Media Library Plugin", author: "The Orchard Team", authorurl: "http://orchardproject.net", infourl: "http://orchardproject.net", version: "1.1" } } }), tinymce.PluginManager.add("medialibrary", tinymce.plugins.Orchard.MediaLibrary) })();
+//@ sourceMappingURL=editor_plugin_src.min.js.map
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/editor_plugin_src.min.js b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/editor_plugin_src.min.js
new file mode 100644
index 000000000..ec1237ac3
--- /dev/null
+++ b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/editor_plugin_src.min.js
@@ -0,0 +1,2 @@
+(function(){tinymce.create("tinymce.plugins.Orchard.MediaLibrary",{init:function(n,t){n.addCommand("mceMediaLibrary",function(){var t,i;(n.focus(),t=location.href.toLowerCase().indexOf("/admin/"),t!==-1)&&(i=location.href.substr(0,t)+"/Admin/Orchard.MediaLibrary?dialog=true",$.colorbox({href:i,iframe:!0,reposition:!0,width:"90%",height:"90%",onLoad:function(){$("html, body").css("overflow","hidden")},onClosed:function(){var n,r,i,u;if($("html, body").css("overflow",""),n=$.colorbox.selectedData,n!=null){for(r="",i=0;i<n.length;i++)u=location.href.substr(0,t)+"/Admin/Orchard.MediaLibrary/MediaItem/"+n[i].id+"?displayType=Raw",$.ajax({async:!1,type:"GET",url:u,success:function(n){r+=n}});tinyMCE.execCommand("mceReplaceContent",!1,r)}}}))}),n.addButton("medialibrary",{title:"Insert Media Item",cmd:"mceMediaLibrary",image:t+"/img/picture_add.png"})},createControl:function(){return null},getInfo:function(){return{longname:"Orchard Media Library Plugin",author:"The Orchard Team",authorurl:"http://orchardproject.net",infourl:"http://orchardproject.net",version:"1.1"}}}),tinymce.PluginManager.add("medialibrary",tinymce.plugins.Orchard.MediaLibrary)})();
+//@ sourceMappingURL=editor_plugin_src.min.js.map
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/editor_plugin_src.min.js.map b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/editor_plugin_src.min.js.map
new file mode 100644
index 000000000..92054a8f1
--- /dev/null
+++ b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/editor_plugin_src.min.js.map
@@ -0,0 +1,8 @@
+{
+"version":3,
+"file":"editor_plugin_src.min.js",
+"lineCount":1,
+"mappings":"CAAC,QAAS,CAAA,CAAG,CAMTA,OAAOC,OAAO,CAAC,sCAAsC,CAAE,CASnD,IAAI,CAAEC,QAAS,CAACC,CAAE,CAAEC,CAAL,CAAU,CAErBD,CAAEE,WAAW,CAAC,iBAAiB,CAAE,QAAS,CAAA,CAAG,CAEzC,IAAIC,EAEAF,CAF2D,EAD/DD,CAAEI,MAAM,CAAA,CAAE,CACND,CAAW,CAAEE,QAAQC,KAAKC,YAAY,CAAA,CAAEC,QAAQ,CAAC,SAAD,C,CAChDL,CAAW,GAAI,G,GACfF,CAAI,CAAEI,QAAQC,KAAKG,OAAO,CAAC,CAAC,CAAEN,CAAJ,CAAgB,CAAE,yC,CAChDO,CAACC,SAAS,CAAC,CACP,IAAI,CAAEV,CAAG,CACT,MAAM,CAAE,CAAA,CAAI,CACZ,UAAU,CAAE,CAAA,CAAI,CAChB,KAAK,CAAE,KAAK,CACZ,MAAM,CAAE,KAAK,CACb,MAAM,CAAEW,QAAQ,CAAA,CAAG,CAEfF,CAAC,CAAC,YAAD,CAAcG,IAAI,CAAC,UAAU,CAAE,QAAb,CAFJ,CAIlB,CACD,QAAQ,CAAEC,QAAQ,CAAA,CAAG,CAGjB,IAAIC,EAKAC,EACKC,EACDC,CAPkC,CAE1C,GAJAR,CAAC,CAAC,YAAD,CAAcG,IAAI,CAAC,UAAU,CAAE,EAAb,CAAgB,CAE/BE,CAAa,CAAEL,CAACC,SAASI,a,CAEzBA,CAAa,EAAG,KAChB,CAGJ,IADIC,CAAW,CAAE,E,CACRC,CAAE,CAAE,CAAC,CAAEA,CAAE,CAAEF,CAAYI,OAAO,CAAEF,CAAC,EAA1C,CACQC,CAAY,CAAEb,QAAQC,KAAKG,OAAO,CAAC,CAAC,CAAEN,CAAJ,CAAgB,CAAE,wCAAyC,CAAEY,CAAa,CAAAE,CAAA,CAAEG,GAAI,CAAE,kB,CACxHV,CAACW,KAAK,CAAC,CACH,KAAK,CAAE,CAAA,CAAK,CACZ,IAAI,CAAE,KAAK,CACX,GAAG,CAAEH,CAAW,CAChB,OAAO,CAAEI,QAAQ,CAACC,CAAD,CAAO,CACpBP,CAAW,EAAGO,CADM,CAJrB,CAAD,CAQV,CAGCC,OAAOC,YAAY,CAAC,mBAAmB,CAAE,CAAA,CAAtB,CAA6BT,CAA7B,CAhBhB,CANa,CAXd,CAAD,EAL+B,CAAhC,CAyCX,CAGFhB,CAAE0B,UAAU,CAAC,cAAc,CAAE,CACzB,KAAK,CAAE,mBAAmB,CAC1B,GAAG,CAAE,iBAAiB,CACtB,KAAK,CAAEzB,CAAI,CAAE,sBAHY,CAAjB,CA9CS,CAmDxB,CAYD,aAAa,CAAE0B,QAAS,CAAA,CAAQ,CAC5B,OAAO,IADqB,CAE/B,CAQD,OAAO,CAAEC,QAAS,CAAA,CAAG,CACjB,MAAO,CACH,QAAQ,CAAE,8BAA8B,CACxC,MAAM,CAAE,kBAAkB,CAC1B,SAAS,CAAE,2BAA2B,CACtC,OAAO,CAAE,2BAA2B,CACpC,OAAO,CAAE,KALN,CADU,CAlF8B,CAAzC,CA2FZ,CAGF/B,OAAOgC,cAAcC,IAAI,CAAC,cAAc,CAAEjC,OAAOkC,QAAQC,QAAQC,aAAxC,CApGhB,EAqGX,CAAA,CAAE",
+"sources":["editor_plugin_src.js"],
+"names":["tinymce","create","init","ed","url","addCommand","adminIndex","focus","location","href","toLowerCase","indexOf","substr","$","colorbox","onLoad","css","onClosed","selectedData","newContent","i","renderMedia","length","id","ajax","success","data","tinyMCE","execCommand","addButton","createControl","getInfo","PluginManager","add","plugins","Orchard","MediaLibrary"]
+}