diff --git a/app/partials/issues-detail-edit.jade b/app/partials/issues-detail-edit.jade
index e9eec7ee..224099ee 100644
--- a/app/partials/issues-detail-edit.jade
+++ b/app/partials/issues-detail-edit.jade
@@ -29,7 +29,21 @@ block content
             - var permissionSuffix = "issue"
             include views/modules/attachments
 
-            textarea(ng-model="issue.comment", placeholder="Write here a new commet")
+            section.us-activity
+                ul.us-activity-tabs
+                    li
+                        a.active(href="#")
+                            span.icon.icon-bulk
+                            span.tab-title Comments
+
+                    li
+                        a(href="#")
+                            span.icon.icon-issues
+                            span.tab-title Activity
+
+                - var commentModel = "us"
+                include views/modules/comments
+                include views/modules/activity
 
         sidebar.menu-secondary.sidebar
             section.us-status(tg-issue-status, ng-model="issue", editable="true")