diff --git a/models/templates/package.json b/models/templates/package.json
index 51e89f48b1..6bcd83aa01 100644
--- a/models/templates/package.json
+++ b/models/templates/package.json
@@ -33,6 +33,7 @@
     "@hcengineering/model-contact": "^0.6.1",
     "@hcengineering/view": "^0.6.4",
     "@hcengineering/model-view": "^0.6.0",
+    "@hcengineering/model-tracker": "^0.6.0",
     "@hcengineering/templates": "^0.6.2",
     "@hcengineering/templates-resources": "^0.6.0",
     "@hcengineering/setting": "^0.6.5",
diff --git a/models/templates/src/index.ts b/models/templates/src/index.ts
index 6f6fa08d76..ce9bb90c33 100644
--- a/models/templates/src/index.ts
+++ b/models/templates/src/index.ts
@@ -29,6 +29,7 @@ import type {
   TemplateFieldFunc
 } from '@hcengineering/templates'
 import templates from './plugin'
+import tracker from '@hcengineering/model-tracker'
 
 export const DOMAIN_TEMPLATES = 'templates' as Domain
 
@@ -159,6 +160,10 @@ export function createModel (builder: Builder): void {
     },
     templates.action.Move
   )
+
+  builder.mixin(templates.class.MessageTemplate, core.class.Class, view.mixin.IgnoreActions, {
+    actions: [view.action.Open, tracker.action.NewRelatedIssue]
+  })
 }
 
 export { templatesOperation } from './migration'
diff --git a/plugins/templates-resources/src/components/Templates.svelte b/plugins/templates-resources/src/components/Templates.svelte
index 534b33744a..824a5ac496 100644
--- a/plugins/templates-resources/src/components/Templates.svelte
+++ b/plugins/templates-resources/src/components/Templates.svelte
@@ -148,7 +148,7 @@
     <div class="ac-header__title"><Label label={templatesPlugin.string.Templates} /></div>
   </div>
 
-  <div class="ac-body columns">
+  <div class="ac-body columns clear-mins">
     <div class="ac-column">
       <div id="create-template" class="flex-between trans-title mb-3">
         <Button