diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index d0b1b34d757b858a64c83faab0fb1b28175aa8f8..a63df79ea83538377ed3c84512c1fddac1077807 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -505,19 +505,21 @@ $tcount+= $ticket->getNumNotes();
                     <label><strong>Response:</strong></label>
                 </td>
                 <td>
-                    <?php
-                    if(($cannedResponses=Canned::responsesByDeptId($ticket->getDeptId()))) {?>
-                        <select id="cannedResp" name="cannedResp">
-                            <option value="0" selected="selected">Select a canned response</option>
-                            <?php
-                            foreach($cannedResponses as $id =>$title) {
+                    <select id="cannedResp" name="cannedResp">
+                        <option value="0" selected="selected">Select a canned response</option>
+                        <option value='lastmessage'>Original Message</option>
+                        <option value='original'>Last Message</option>
+                        <?php
+                        if(($cannedResponses=Canned::responsesByDeptId($ticket->getDeptId()))) {
+                            echo '<option value="0" disabled="disabled">
+                                ------------- Premade Replies ------------- </option>';
+                            foreach($cannedResponses as $id =>$title)
                                 echo sprintf('<option value="%d">%s</option>',$id,$title);
-                            }
-                            ?>
-                        </select>
-                        <br>
+                        }
+                        ?>
+                    </select>
+                    <br>
                     <?php
-                    }
                     $signature = '';
                     switch ($thisstaff->getDefaultSignatureType()) {
                     case 'dept':
diff --git a/scp/ajax.php b/scp/ajax.php
index 6f784080b2d8d018a35274792b4e6f8005403a9f..a192cce8cf92da76bf185a441840093133d03099 100644
--- a/scp/ajax.php
+++ b/scp/ajax.php
@@ -137,7 +137,8 @@ $dispatcher = patterns('',
         url_get('^lookup', 'lookup'),
         url_get('^search', 'search'),
         url_get('^(?P<tid>\d+)/forms/manage$', 'manageForms'),
-        url_post('^(?P<tid>\d+)/forms/manage$', 'updateForms')
+        url_post('^(?P<tid>\d+)/forms/manage$', 'updateForms'),
+        url_get('^(?P<tid>\d+)/canned-resp/(?P<cid>\w+).(?P<format>json|txt)', 'cannedResponse')
     )),
     url('^/collaborators/', patterns('ajax.tickets.php:TicketsAjaxAPI',
         url_get('^(?P<cid>\d+)/view$', 'viewCollaborator'),
diff --git a/scp/js/scp.js b/scp/js/scp.js
index 294917b4d2795e86b6b1aa60eba6f5e70c201cd5..40b04a962a8cdfe411e31bdc506a8c15c6f6489f 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -195,16 +195,18 @@ var scp_prep = function() {
 
     $('form select#cannedResp').change(function() {
 
-        var fObj=$(this).closest('form');
-        var cannedId = $(this).val();
-        var ticketId = $(':input[name=id]',fObj).val();
-
+        var fObj = $(this).closest('form');
+        var cid = $(this).val();
+        var tid = $(':input[name=id]',fObj).val();
         $(this).find('option:first').attr('selected', 'selected').parent('select');
 
+        var $url = 'ajax.php/kb/canned-response/'+cid+'.json';
+        if (tid)
+            $url =  'ajax.php/tickets/'+tid+'/canned-resp/'+cid+'.json';
+
         $.ajax({
                 type: "GET",
-                url: 'ajax.php/kb/canned-response/'+cannedId+'.json',
-                data: 'tid='+ticketId,
+                url: $url,
                 dataType: 'json',
                 cache: false,
                 success: function(canned){