diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comment.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comment.cshtml
index 8e218f939..b14a0ce10 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comment.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comment.cshtml
@@ -7,8 +7,12 @@
 
     var children = New.List(Items: Model.Items);
     children.Classes.Add("comments");
+
+    Model.Classes.Add("comment");
+    Model.Classes.Add("comment-"+comment.Id);
+    var tag = Tag(Model, "article");
 }
-<article class="comment comment-@comment.Id">
+@tag.StartElement
     <header>
         <h4>
             <span class="who">@Display.CommentAuthor(ContentPart: comment)</span>
@@ -22,6 +26,4 @@
     @Display.CommentText(ContentPart: Model.ContentPart, ContentItem: Model.ContentItem)
 
     @Display(children)
-</article>
-
-
+@tag.EndElement
\ No newline at end of file