diff --git a/include/class.ticket.php b/include/class.ticket.php
index de0befdff87b7ed5de59a8f27fc2e790fbde0e61..fe114a29dd6aab28c776cee8c889824023ef7290 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -2433,11 +2433,15 @@ class Ticket {
 
             $attachments =($cfg->emailAttachments() && $response)?$response->getAttachments():array();
 
-            $msg = $ticket->replaceVars($msg->asArray(), array(
-                'message' => $message,
-                'signature' => $signature,
-                'response' => ($response) ? $response->getBody() : '',
-            ));
+            $msg = $ticket->replaceVars($msg->asArray(),
+                    array(
+                        'message'   => $message,
+                        'signature' => $signature,
+                        'response'  => ($response) ? $response->getBody() : '',
+                        'recipient' => $ticket->getOwner(), //End user
+                        'staff'     => $thisstaff,
+                        )
+                    );
 
             if($cfg->stripQuotedReply() && ($tag=trim($cfg->getReplySeparator())))
                 $msg['body'] = "<p style=\"display:none\">$tag<p>".$msg['body'];