diff --git a/src/Orchard.Web/Core/Common/Controllers/BodyDriver.cs b/src/Orchard.Web/Core/Common/Controllers/BodyDriver.cs
index a9df16837..5613793b5 100644
--- a/src/Orchard.Web/Core/Common/Controllers/BodyDriver.cs
+++ b/src/Orchard.Web/Core/Common/Controllers/BodyDriver.cs
@@ -1,4 +1,5 @@
-using Orchard.ContentManagement;
+using System.Text.RegularExpressions;
+using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
 using Orchard.Core.Common.Models;
 using Orchard.Core.Common.ViewModels;
@@ -19,7 +20,7 @@ namespace Orchard.Core.Common.Controllers {
 
         // \/\/ Haackalicious on many accounts - don't copy what has been done here for the wrapper \/\/
         protected override DriverResult Display(BodyAspect part, string displayType) {
-            var model = new BodyDisplayViewModel { BodyAspect = part };
+            var model = new BodyDisplayViewModel { BodyAspect = part, Text = BbcodeReplace(part.Text)};
             return Combined(
                 Services.Authorizer.Authorize(Permissions.ChangeOwner) ? ContentPartTemplate(model, "Parts/ManageWrapperPre").Location("primary", "5") : null,
                 Services.Authorizer.Authorize(Permissions.ChangeOwner) ? ContentPartTemplate(model, "Parts/Manage").Location("primary", "5") : null,
@@ -37,5 +38,18 @@ namespace Orchard.Core.Common.Controllers {
             updater.TryUpdateModel(model, Prefix, null, null);
             return ContentPartTemplate(model, TemplateName, Prefix).Location("primary", "5");
         }
+
+        // Can be moved somewhere else once we have IoC enabled body text filters.
+        private static string BbcodeReplace(string bodyText) {
+            Regex urlRegex = new Regex(@"\[url\]([^\]]+)\[\/url\]");
+            Regex urlRegexWithLink = new Regex(@"\[url=([^\]]+)\]([^\]]+)\[\/url\]");
+            Regex imgRegex = new Regex(@"\[img\]([^\]]+)\[\/img\]");
+
+            bodyText = urlRegex.Replace(bodyText, "<a href=\"$1\">$1</a>");
+            bodyText = urlRegexWithLink.Replace(bodyText, "<a href=\"$1\">$2</a>");
+            bodyText = imgRegex.Replace(bodyText, "<img src=\"$1\" />");
+
+            return bodyText;
+        }
     }
 }
diff --git a/src/Orchard.Web/Core/Common/ViewModels/BodyDisplayViewModel.cs b/src/Orchard.Web/Core/Common/ViewModels/BodyDisplayViewModel.cs
index 6daf73520..e9c01fad0 100644
--- a/src/Orchard.Web/Core/Common/ViewModels/BodyDisplayViewModel.cs
+++ b/src/Orchard.Web/Core/Common/ViewModels/BodyDisplayViewModel.cs
@@ -3,5 +3,6 @@
 namespace Orchard.Core.Common.ViewModels {
     public class BodyDisplayViewModel {
         public BodyAspect BodyAspect { get; set; }
+        public string Text { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ascx b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ascx
index 712ecf52d..8af1ea411 100644
--- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ascx
+++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.ascx
@@ -1,3 +1,3 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BodyDisplayViewModel>" %>
 <%@ Import Namespace="Orchard.Core.Common.ViewModels"%>
-<%=Model.BodyAspect.Record.Text %>
\ No newline at end of file
+<%=Model.Text %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx
index 469d4fdfa..cea3d55bc 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx
@@ -6,4 +6,4 @@
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <h2><%=Html.Link(Html.Encode(Model.Item.Title), Url.BlogPost(Model.Item.Blog.Slug, Model.Item.Slug)) %></h2>
 <div class="meta"><%=Html.PublishedState(Model.Item) %> | <%Html.Zone("meta");%></div>
-<div class="content"><%=Model.Item.Text ?? string.Format("<p><em>{0}</em></p>", _Encoded("there's no content for this blog post"))%></div>
+<div class="content"><% Html.Zone("primary", ":manage :metadata");%></div>
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx b/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx
index ef09d7a67..3ebd66d1c 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.Summary.ascx
@@ -1,6 +1,9 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<Orchard.Pages.Models.Page>>" %>
+<%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.ContentManagement"%>
 <%@ Import Namespace="Orchard.Core.Common.Models"%>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <h3><a href="<%=Url.Action(T("Item").ToString(), "Page", new { slug = Model.Item.Slug }) %>"><%=Html.Encode(Model.Item.Title) %></a></h3>
-<div class="content"><%=Model.Item.As<BodyAspect>().Text ?? T("<p><em>there's no content for this blog post</em></p>").ToString() %></div>
\ No newline at end of file
+<div class="content">
+<% Html.Zone("primary", ":manage :metadata"); %>
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx
index bf9f0d646..7708026f4 100644
--- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx
+++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx
@@ -6,4 +6,6 @@
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <h2><%=Html.Link(Html.Encode(Model.Item.Title), Url.BlogPost(Model.Item.Blog.Slug, Model.Item.Slug)) %></h2>
 <div class="meta"><%=Html.PublishedState(Model.Item) %> | <%Html.Zone("meta");%></div>
-<div class="postsummary"><%=Model.Item.Text ?? string.Format("<p><em>{0}</em></p>", _Encoded("there's no content for this blog post"))%></div>
+<div class="postsummary">
+<% Html.Zone("primary", ":manage :metadata"); %>
+</div>
diff --git a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx
index 3f3463d7c..c795663ef 100644
--- a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx
+++ b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx
@@ -9,4 +9,6 @@
 
 <div class="meta"><%=Html.PublishedState(Model.Item) %> | <%Html.Zone("meta");%></div>
 
-<div class="postsummary"><%=Model.Item.Text ?? string.Format("<p><em>{0}</em></p>", _Encoded("there's no content for this blog post"))%></div>
+<div class="postsummary">
+<% Html.Zone("primary", ":manage :metadata"); %>
+</div>