diff --git a/src/Orchard.Web/Core/Contents/Views/Content.cshtml b/src/Orchard.Web/Core/Contents/Views/Content.cshtml
index e8c800f77..4d2a1142b 100644
--- a/src/Orchard.Web/Core/Contents/Views/Content.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Content.cshtml
@@ -3,22 +3,27 @@
     if (Model.Title != null) {
         Layout.Title = Model.Title;
     }
+
+    Model.Classes.Add("content-item");
     
     var contentTypeClassName = ((string)Model.ContentItem.ContentType).HtmlClassify();
+    Model.Classes.Add(contentTypeClassName);
+    
+    var tag = Tag(Model, "article");
 }
-<article class="content-item @contentTypeClassName">
+@tag.StartElement
     <header>
         @Display(Model.Header)
         @if (Model.Meta != null) {
-        <div class="metadata">
-            @Display(Model.Meta)
-        </div>
+            <div class="metadata">
+                @Display(Model.Meta)
+            </div>
         }
     </header>
     @Display(Model.Content)
     @if(Model.Footer != null) {
-    <footer>
-        @Display(Model.Footer)
-    </footer>
+        <footer>
+            @Display(Model.Footer)
+        </footer>
     }
-</article>
\ No newline at end of file
+@tag.EndElement
\ No newline at end of file