Merge pull request #21385 from eileenmcnaughton/email_fix

#2814 Fix activity:sendEmail follow up

CRM/Activity/BAO/Activity.php

@@ -1168,9 +1168,9 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity {
         $from,
         $userID,
         $contactId,
-        $tokenSubject,
-        $tokenText,
-        $tokenHtml,
+        $renderedTemplate['subject'],
+        $renderedTemplate['text'],
+        $renderedTemplate['html'],
         $emailAddress,
         $activityID,
         // get the set of attachments from where they are stored