diff --git a/dreditor.user.js b/dreditor.user.js
index 676800c..b7f7c33 100644
--- a/dreditor.user.js
+++ b/dreditor.user.js
@@ -1359,6 +1359,66 @@ Drupal.behaviors.dreditorIssueSummary = function (context) {
   });
 };
 
+/*
+ * Add Issue template to New issue and provide button to append to existing issue
+ */
+Drupal.behaviors.dreditorIssueAddEdit = function(context) {
+ /**
+  * Fetches the node to retrieve the original poster's name and profile link.
+  */
+  var getPoster = function() {
+    // Load the issue's view page.
+    $.get($('#tabs a:contains("View")').attr('href'), function(data) {
+      // Find the link to the original poster's profile.
+      var link = $(data).find('div.node > div.submitted a');
+      // Assemble markup for a link and insert it in the summary template.
+      var new_link = '<a href="' + link.attr('href') + '">' + link.text() + '</a>';
+      $('#edit-body').val($('#edit-body').val().replace(/\[username\]/, new_link));
+    });
+  };
+
+  var injectTemplate = function() {
+    $.get('http://drupal.org/node/1155816', function(data) {
+      // We need the first codeblock to extract the template
+      var template = $(data).find('div.codeblock:first > code');
+      var text = template.text();
+      // Insert whitelines
+      text = text.replace(/<h3/g, "\n\n<h3").replace(/<\/h3>/g, "</h3>\n\n");
+      var currentText = $('#edit-body').val();
+      // Prepend text to current body
+      $('#edit-body').val(text + currentText);
+      if (currentText.length != 0) {
+        getPoster();
+      }
+    });
+  };
+
+  // TODO: autoinject template?
+  $('body.logged-in.page-node div.project-issue #edit-body').once('dreditorIssueAdd', function() {
+    if ($('#edit-body').val() == '') {
+      injectTemplate();
+    };
+  });
+
+  $('body.logged-in.page-node.node-type-project-issue #edit-body').once('dreditorIssueEdit', function() {
+    // We want to append the button in the label area
+    var $label = $('label[for="edit-body"]');
+    // Button to inject the template
+    var $action = $('<a>')
+      .attr('href', '#')
+      .appendTo($label)
+      .text("Insert template")
+      .attr('class', 'dreditor-button')
+      .click(function() {
+        injectTemplate();
+        return false;
+      }
+    );
+    // Make it a commandbutton
+    $action.wrap('<span>&nbsp;&nbsp;</span>');
+  });
+};
+
 /**
  * Streamline issue comment form.
  *