diff --git a/app/partials/issues-detail-edit.jade b/app/partials/issues-detail-edit.jade
index 39d1f067..48fc3138 100644
--- a/app/partials/issues-detail-edit.jade
+++ b/app/partials/issues-detail-edit.jade
@@ -32,22 +32,7 @@ block content
             - var permissionSuffix = "issue"
             include views/modules/attachments
 
-            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"
-                - var noSaveButton = true
-                include views/modules/comments
-                include views/modules/activity
+            tg-history(ng-model="issue", type="issue", mode="edit")
 
         sidebar.menu-secondary.sidebar
             section.us-status(tg-issue-status, ng-model="issue", editable="true")
diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade
index 1c25f4fe..849208af 100644
--- a/app/partials/issues-detail.jade
+++ b/app/partials/issues-detail.jade
@@ -32,21 +32,7 @@ block content
             - var permissionSuffix = "issue"
             include views/modules/attachments
 
-            section.us-activity
-                ul.us-activity-tabs
-                    li
-                        a.active(href="#")
-                            span.icon.icon-comment
-                            span.tab-title Comments
-
-                    li
-                        a(href="#")
-                            span.icon.icon-issues
-                            span.tab-title Activity
-
-                - var commentModel = "issue"
-                include views/modules/comments
-                include views/modules/activity
+            tg-history(ng-model="issue", type="issue")
 
         sidebar.menu-secondary.sidebar
             section.us-status(tg-issue-status, ng-model="issue")
diff --git a/app/partials/task-detail-edit.jade b/app/partials/task-detail-edit.jade
index d55ce906..f88c134e 100644
--- a/app/partials/task-detail-edit.jade
+++ b/app/partials/task-detail-edit.jade
@@ -32,22 +32,7 @@ block content
             - var permissionSuffix = "task"
             include views/modules/attachments
 
-            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 = "task"
-                - var noSaveButton = true
-                include views/modules/comments
-                include views/modules/activity
+            tg-history(ng-model="task", type="task", mode="edit")
 
         sidebar.menu-secondary.sidebar
             section.us-status(tg-task-status, ng-model="task", editable="true")
diff --git a/app/partials/task-detail.jade b/app/partials/task-detail.jade
index fcbcc5cb..199d5dc4 100644
--- a/app/partials/task-detail.jade
+++ b/app/partials/task-detail.jade
@@ -32,21 +32,7 @@ block content
             - var permissionSuffix = "task"
             include views/modules/attachments
 
-            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 = "task"
-                include views/modules/comments
-                include views/modules/activity
+            tg-history(ng-model="task", type="task")
 
         sidebar.menu-secondary.sidebar
             section.us-status(tg-task-status, ng-model="task")
diff --git a/app/partials/us-detail-edit.jade b/app/partials/us-detail-edit.jade
index e1ea9592..161a2f12 100644
--- a/app/partials/us-detail-edit.jade
+++ b/app/partials/us-detail-edit.jade
@@ -32,22 +32,7 @@ block content
             - var permissionSuffix = "us"
             include views/modules/attachments
 
-            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"
-                - var noSaveButton = true
-                include views/modules/comments
-                include views/modules/activity
+            tg-history(ng-model="us", type="us", mode="edit")
 
         sidebar.menu-secondary.sidebar
             section.us-status(tg-us-status-detail, ng-model="us", editable="true")
diff --git a/app/partials/us-detail.jade b/app/partials/us-detail.jade
index cfe263e3..857277f1 100644
--- a/app/partials/us-detail.jade
+++ b/app/partials/us-detail.jade
@@ -36,21 +36,7 @@ block content
             - var permissionSuffix = "us"
             include views/modules/attachments
 
-            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
+            tg-history(ng-model="us", type="us")
 
         sidebar.menu-secondary.sidebar
             section.us-status(tg-us-status-detail, ng-model="us")