diff --git a/CRM/Activity/Form/Task/PDF.php b/CRM/Activity/Form/Task/PDF.php
new file mode 100644
index 000000000000..2638b3263b89
--- /dev/null
+++ b/CRM/Activity/Form/Task/PDF.php
@@ -0,0 +1,78 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 5                                                  |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC (c) 2004-2019
+ */
+
+/**
+ * This class provides the functionality to create PDF/Word letters for activities.
+ */
+class CRM_Activity_Form_Task_PDF extends CRM_Activity_Form_Task {
+  /**
+   * Build all the data structures needed to build the form.
+   */
+  public function preProcess() {
+    parent::preProcess();
+    CRM_Activity_Form_Task_PDFLetterCommon::preProcess($this);
+  }
+
+  /**
+   * Set defaults for the pdf.
+   *
+   * @return array
+   */
+  public function setDefaultValues() {
+    return CRM_Activity_Form_Task_PDFLetterCommon::setDefaultValues();
+  }
+
+  /**
+   * Build the form object.
+   */
+  public function buildQuickForm() {
+    CRM_Activity_Form_Task_PDFLetterCommon::buildQuickForm($this);
+  }
+
+  /**
+   * Process the form after the input has been submitted and validated.
+   */
+  public function postProcess() {
+    CRM_Activity_Form_Task_PDFLetterCommon::postProcess($this);
+  }
+
+  /**
+   * List available tokens for this form.
+   *
+   * @return array
+   */
+  public function listTokens() {
+    return CRM_Activity_Form_Task_PDFLetterCommon::listTokens();
+  }
+
+}
diff --git a/CRM/Activity/Form/Task/PDFLetterCommon.php b/CRM/Activity/Form/Task/PDFLetterCommon.php
new file mode 100644
index 000000000000..a17b5b861be6
--- /dev/null
+++ b/CRM/Activity/Form/Task/PDFLetterCommon.php
@@ -0,0 +1,90 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 5                                                  |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+ */
+
+use Civi\Token\TokenProcessor;
+
+/**
+ * This class provides the common functionality for creating PDF letter for
+ * activities.
+ *
+ */
+class CRM_Activity_Form_Task_PDFLetterCommon extends CRM_Core_Form_Task_PDFLetterCommon {
+
+  /**
+   * Process the form after the input has been submitted and validated.
+   *
+   * @param CRM_Core_Form $form
+   * @param $activityIds
+   *
+   * @return void
+   */
+  public static function postProcess(&$form) {
+    $activityIds = $form->_activityHolderIds;
+    $formValues = $form->controller->exportValues($form->getName());
+    $html_message = self::processTemplate($formValues);
+
+    // Do the rest in another function to make testing easier
+    self::createDocument($activityIds, $html_message, $formValues);
+
+    $form->postProcessHook();
+
+    CRM_Utils_System::civiExit(1);
+  }
+
+  /**
+   * Produce the document from the activities
+   * This uses the new token processor
+   *
+   * @param  array $activityIds  array of activity ids
+   * @param  string $html_message message text with tokens
+   * @param  array $formValues   formValues from the form
+   * @return void
+   */
+  public static function createDocument($activityIds, $html_message, $formValues) {
+    $tp = self::createTokenProcessor();
+    $tp->addMessage('body_html', $html_message, 'text/html');
+
+    foreach ($activityIds as $activityId) {
+      $tp->addRow()->context('activityId', $activityId);
+    }
+    $tp->evaluate();
+
+    return self::renderFromRows($tp->getRows(), 'body_html', $formValues);
+  }
+
+  /**
+   * Create a token processor
+   */
+  public static function createTokenProcessor() {
+    return new TokenProcessor(\Civi::dispatcher(), array(
+      'controller' => get_class(),
+      'smarty' => FALSE,
+      'schema' => ['activityId'],
+    ));
+  }
+
+}
diff --git a/CRM/Activity/Task.php b/CRM/Activity/Task.php
index 00bfcbffd952..2127258512d4 100644
--- a/CRM/Activity/Task.php
+++ b/CRM/Activity/Task.php
@@ -84,6 +84,11 @@ public static function tasks() {
           ],
           'result' => FALSE,
         ],
+        self::PDF_LETTER => [
+          'title' => ts('Print/merge Document'),
+          'class' => 'CRM_Activity_Form_Task_PDF',
+          'result' => FALSE,
+        ],
         self::TASK_SMS => [
           'title' => ts('SMS - send reply'),
           'class' => 'CRM_Activity_Form_Task_SMS',
diff --git a/CRM/Activity/Tokens.php b/CRM/Activity/Tokens.php
index 3271b965922f..0f11f88a9b56 100644
--- a/CRM/Activity/Tokens.php
+++ b/CRM/Activity/Tokens.php
@@ -36,22 +36,38 @@
  *
  * Generate "activity.*" tokens.
  *
- * This TokenSubscriber was produced by refactoring the code from the
+ * This TokenSubscriber was originally produced by refactoring the code from the
  * scheduled-reminder system with the goal of making that system
  * more flexible. The current implementation is still coupled to
  * scheduled-reminders. It would be good to figure out a more generic
  * implementation which is not tied to scheduled reminders, although
  * that is outside the current scope.
+ *
+ * This has been enhanced to work with PDF/letter merge
  */
 class CRM_Activity_Tokens extends \Civi\Token\AbstractTokenSubscriber {
 
+  private $basicTokens;
+  private $customFieldTokens;
+  private $specialTokens;
+
+  // Mapping from tokenName to api return field
+  // Use lists since we might need multiple fields
+  private static $fieldMapping = [
+    'activity_id' => ['id'],
+    'activity_type' => ['activity_type_id'],
+    'status' => ['status_id'],
+    'campaign' => ['campaign_id'],
+  ];
+
   /**
    * CRM_Activity_Tokens constructor.
    */
   public function __construct() {
     parent::__construct('activity', array_merge(
       $this->getBasicTokens(),
-      $this->getCustomFieldTokens()
+      $this->getCustomFieldTokens(),
+      $this->getSpecialTokens()
     ));
   }
 
@@ -59,9 +75,35 @@ public function __construct() {
    * @inheritDoc
    */
   public function checkActive(\Civi\Token\TokenProcessor $processor) {
-    // Extracted from scheduled-reminders code. See the class description.
-    return !empty($processor->context['actionMapping'])
-      && $processor->context['actionMapping']->getEntity() === 'civicrm_activity';
+    return
+      in_array('activityId', $processor->context['schema']) ||
+      (!empty($processor->context['actionMapping'])
+      && $processor->context['actionMapping']->getEntity() === 'civicrm_activity');
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public function getActiveTokens(\Civi\Token\Event\TokenValueEvent $e) {
+    $messageTokens = $e->getTokenProcessor()->getMessageTokens();
+    if (!isset($messageTokens[$this->entity])) {
+      return NULL;
+    }
+
+    $activeTokens = [];
+    // if message token contains '_\d+_', then treat as '_N_'
+    foreach ($messageTokens[$this->entity] as $msgToken) {
+      if (array_key_exists($msgToken, $this->tokenNames)) {
+        $activeTokens[] = $msgToken;
+      }
+      else {
+        $altToken = preg_replace('/_\d+_/', '_N_', $msgToken);
+        if (array_key_exists($altToken, $this->tokenNames)) {
+          $activeTokens[] = $msgToken;
+        }
+      }
+    }
+    return array_unique($activeTokens);
   }
 
   /**
@@ -76,39 +118,189 @@ public function alterActionScheduleQuery(\Civi\ActionSchedule\Event\MailingQuery
     // Multiple revisions of the activity.
     // Q: Could we simplify & move the extra AND clauses into `where(...)`?
     $e->query->param('casEntityJoinExpr', 'e.id = reminder.entity_id AND e.is_current_revision = 1 AND e.is_deleted = 0');
+  }
+
+  /**
+   * Find the fields that we need to get to construct the tokens requested.
+   * @param  array $tokens list of tokens
+   * @return array         list of fields needed to generate those tokens
+   */
+  public function getReturnFields($tokens) {
+    $fields = ['id']; // Make sure we always return something
+
+    foreach (array_intersect($tokens,
+      array_merge(array_keys(self::getBasicTokens()), array_keys(self::getCustomFieldTokens()))
+      ) as $token) {
+      if (isset(self::$fieldMapping[$token])) {
+        $fields = array_merge($fields, self::$fieldMapping[$token]);
+      }
+      else {
+        $fields[] = $token;
+      }
+    }
+    return array_unique($fields);
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public function prefetch(\Civi\Token\Event\TokenValueEvent $e) {
+    // Find all the activity IDs
+    $activityIds
+      = $e->getTokenProcessor()->getContextValues('actionSearchResult', 'entityID')
+      + $e->getTokenProcessor()->getContextValues('activityId');
+
+    if (!$activityIds) {
+      return;
+    }
+
+    // Get data on all activities for basic and customfield tokens
+    $activities = civicrm_api3('Activity', 'get', [
+      'id' => ['IN' => $activityIds],
+      'options' => ['limit' => 0],
+      'return' => self::getReturnFields($this->activeTokens),
+    ]);
+    $prefetch['activity'] = $activities['values'];
+
+    // Get data for special tokens
+    list($prefetch['activityContact'], $prefetch['contact'])
+      = self::prefetchSpecialTokens($this->activeTokens, $activityIds);
 
-    // FIXME: seems too broad.
-    $e->query->select('e.*');
-    $e->query->select('ov.label as activity_type, e.id as activity_id');
+    // Store the activity types if needed
+    if (in_array('activity_type', $this->activeTokens)) {
+      $this->activityTypes = \CRM_Core_OptionGroup::values('activity_type');
+    }
+
+    // Store the activity statuses if needed
+    if (in_array('status', $this->activeTokens)) {
+      $this->activityStatuses = \CRM_Core_OptionGroup::values('activity_status');
+    }
+
+    // Store the campaigns if needed
+    if (in_array('campaign', $this->activeTokens)) {
+      $this->campaigns = \CRM_Campaign_BAO_Campaign::getCampaigns();
+    }
+
+    return $prefetch;
+  }
 
-    $e->query->join("og", "!casMailingJoinType civicrm_option_group og ON og.name = 'activity_type'");
-    $e->query->join("ov", "!casMailingJoinType civicrm_option_value ov ON e.activity_type_id = ov.value AND ov.option_group_id = og.id");
+  /**
+   * Do the prefetch for the special tokens
+   * @param  array $activeTokens The list of active tokens
+   * @param  array $activityIds  list of activity ids
+   * @return array               the prefetched data for these tokens
+   */
+  public function prefetchSpecialTokens($activeTokens, $activityIds) {
+    $activityContacts = $contacts = [];
+    // See if we need activity contacts
+    $needContacts = FALSE;
+    foreach ($activeTokens as $token) {
+      if (preg_match('/^source|target|assignee/', $token)) {
+        $needContacts = TRUE;
+        break;
+      }
+    }
 
-    // if CiviCase component is enabled, join for caseId.
-    $compInfo = CRM_Core_Component::getEnabledComponents();
-    if (array_key_exists('CiviCase', $compInfo)) {
-      $e->query->select("civicrm_case_activity.case_id as case_id");
-      $e->query->join('civicrm_case_activity', "LEFT JOIN `civicrm_case_activity` ON `e`.`id` = `civicrm_case_activity`.`activity_id`");
+    // If we need ActivityContacts, load them
+    if ($needContacts) {
+      $result = civicrm_api3('ActivityContact', 'get', [
+        'sequential' => 1,
+        'activity_id' => ['IN' => $activityIds],
+        'options' => ['limit' => 0],
+      ]);
+      $contactIds = [];
+      $types = ['1' => 'assignee', '2' => 'source', '3' => 'target'];
+      foreach ($result['values'] as $ac) {
+        if ($ac['record_type_id'] == 2) {
+          $activityContacts[$ac['activity_id']][$types[$ac['record_type_id']]] = $ac['contact_id'];
+        }
+        else {
+          $activityContacts[$ac['activity_id']][$types[$ac['record_type_id']]][] = $ac['contact_id'];
+        }
+        $contactIds[$ac['contact_id']] = 1;
+      }
+      // @TODO only return the wanted fields
+      // maybe use CRM_Contact_Tokens::prefetch() ?
+      $result = civicrm_api3('Contact', 'get', [
+        'id' => ['IN' => array_keys($contactIds)],
+        'options' => ['limit' => 0],
+      ]);
+      $contacts = $result['values'];
     }
+    return [$activityContacts, $contacts];
   }
 
   /**
    * @inheritDoc
    */
   public function evaluateToken(\Civi\Token\TokenRow $row, $entity, $field, $prefetch = NULL) {
-    $actionSearchResult = $row->context['actionSearchResult'];
+    // maps token name to api field
+    $mapping = [
+      'activity_id' => 'id',
+    ];
 
-    if (in_array($field, array('activity_date_time'))) {
-      $row->tokens($entity, $field, \CRM_Utils_Date::customFormat($actionSearchResult->$field));
+    // Get ActivityID either from actionSearchResult (for scheduled reminders) if exists
+    $activityId = isset($row->context['actionSearchResult']->entityID)
+      ? $row->context['actionSearchResult']->entityID
+      : $row->context['activityId'];
+
+    $activity = (object) $prefetch['activity'][$activityId];
+
+    if (in_array($field, ['activity_date_time', 'created_date'])) {
+      $row->tokens($entity, $field, \CRM_Utils_Date::customFormat($activity->$field));
+    }
+    elseif (isset($mapping[$field]) AND (isset($activity->{$mapping[$field]}))) {
+      $row->tokens($entity, $field, $activity->{$mapping[$field]});
     }
-    elseif (isset($actionSearchResult->$field)) {
-      $row->tokens($entity, $field, $actionSearchResult->$field);
+    elseif (in_array($field, ['activity_type'])) {
+      $row->tokens($entity, $field, $this->activityTypes[$activity->activity_type_id]);
     }
-    elseif ($cfID = \CRM_Core_BAO_CustomField::getKeyID($field)) {
-      $row->customToken($entity, $cfID, $actionSearchResult->entity_id);
+    elseif (in_array($field, ['status'])) {
+      $row->tokens($entity, $field, $this->activityStatuses[$activity->status_id]);
     }
-    else {
-      $row->tokens($entity, $field, '');
+    elseif (in_array($field, ['campaign'])) {
+      $row->tokens($entity, $field, $this->campaigns[$activity->campaign_id]);
+    }
+    elseif (array_key_exists($field, $this->customFieldTokens)) {
+      $row->tokens($entity, $field,
+        isset($activity->$field)
+          ? \CRM_Core_BAO_CustomField::displayValue($activity->$field, $field)
+          : ''
+      );
+    }
+    elseif (isset($activity->$field)) {
+      $row->tokens($entity, $field, $activity->$field);
+    }
+    elseif (preg_match('/^(target|assignee|source)_/', $field, $match)) {
+      if ($match[1] == 'source') {
+        $fieldParts = explode('_', $field, 2);
+        $contactId = \CRM_Utils_Array::value($fieldParts[0], $prefetch['activityContact'][$activity->id]);
+        $wantedField = $fieldParts[1];
+      }
+      else {
+        $fieldParts = explode('_', $field, 3);
+        $contactIds = \CRM_Utils_Array::value($fieldParts[0], $prefetch['activityContact'][$activity->id]);
+        $selectedId = (int) $fieldParts[1] > 0 ? $fieldParts[1] - 1 : 0;
+        $contactId = \CRM_Utils_Array::value($selectedId, $contactIds);
+        $wantedField = $fieldParts[2];
+      }
+      $contact = \CRM_Utils_Array::value($contactId, $prefetch['contact']);
+      if (!$contact) {
+        $row->tokens($entity, $field, '');
+      }
+      else {
+        $contact = (object) $contact;
+        // This is OK for simple tokens, but would be better for this to be handled by
+        // CRM_Contact_Tokens ... but that doesn't exist yet.
+        $row->tokens($entity, $field, $contact->$wantedField);
+      }
+    }
+    elseif (preg_match('/^(targets|assignees)_count/', $field, $match)) {
+      $type = rtrim($match[1], 's');
+      ;
+      $row->tokens($entity, $field, count(
+        \CRM_Utils_Array::value($type, $prefetch['activityContact'][$activity->id], [])
+      ));
     }
   }
 
@@ -118,13 +310,29 @@ public function evaluateToken(\Civi\Token\TokenRow $row, $entity, $field, $prefe
    * @return array token name => token label
    */
   protected function getBasicTokens() {
-    return [
-      'activity_id' => ts('Activity ID'),
-      'activity_type' => ts('Activity Type'),
-      'subject' => ts('Activity Subject'),
-      'details' => ts('Activity Details'),
-      'activity_date_time' => ts('Activity Date-Time'),
-    ];
+    if (!isset($this->basicTokens)) {
+      $this->basicTokens = [
+        'activity_id' => ts('Activity ID'),
+        'activity_type' => ts('Activity Type'),
+        'subject' => ts('Activity Subject'),
+        'details' => ts('Activity Details'),
+        'activity_date_time' => ts('Activity Date-Time'),
+        'activity_type_id' => ts('Activity Type ID'),
+        'status' => ts('Activity Status'),
+        'status_id' => ts('Activity Status ID'),
+        'location' => ts('Activity Location'),
+        'created_date' => ts('Activity Creation Date'),
+        'duration' => ts('Activity Duration'),
+        'campaign' => ts('Activity Campaign'),
+        'campaign_id' => ts('Activity Campaign ID'),
+        'targets_count' => ts('Count of Activity Targets'),
+        'assignees_count' => ts('Count of Activity Assignees'),
+      ];
+      if (array_key_exists('CiviCase', CRM_Core_Component::getEnabledComponents())) {
+        $this->basicTokens['case_id'] = ts('Activity Case ID');
+      }
+    }
+    return $this->basicTokens;
   }
 
   /**
@@ -132,7 +340,29 @@ protected function getBasicTokens() {
    * @return array token name => token label
    */
   protected function getCustomFieldTokens() {
-    return CRM_Utils_Token::getCustomFieldTokens('Activity');
+    if (!isset($this->customFieldTokens)) {
+      $this->customFieldTokens = \CRM_Utils_Token::getCustomFieldTokens('Activity');
+    }
+    return $this->customFieldTokens;
+  }
+
+  /**
+   * Get the special tokens - ie tokens that need special handling
+   * @return array token name => token label
+   */
+  protected function getSpecialTokens() {
+    if (!isset($this->specialTokens)) {
+      $this->specialTokens = [];
+      foreach (\CRM_Core_SelectValues::contactTokens() as $label => $name) {
+        $match = [];
+        if (preg_match('/{contact\.(.*)}/', $label, $match)) {
+          $this->specialTokens['source_' . $match[1]] = "(Source) " . $name;
+          $this->specialTokens['target_N_' . $match[1]] = "(Target N) " . $name;
+          $this->specialTokens['assignee_N_' . $match[1]] = "(Assignee N) " . $name;
+        }
+      }
+    }
+    return $this->specialTokens;
   }
 
 }
diff --git a/CRM/Core/Form/Task/PDFLetterCommon.php b/CRM/Core/Form/Task/PDFLetterCommon.php
index 5fd95efa67ef..2cdfa9dbf5dc 100644
--- a/CRM/Core/Form/Task/PDFLetterCommon.php
+++ b/CRM/Core/Form/Task/PDFLetterCommon.php
@@ -235,6 +235,10 @@ public static function formRule($fields, $files, $self) {
 
   /**
    * Handle the template processing part of the form
+   *
+   * @param array $formValues
+   *
+   * @return string $html_message
    */
   public static function processTemplate(&$formValues) {
     $html_message = CRM_Utils_Array::value('html_message', $formValues);
@@ -336,4 +340,45 @@ public static function formatMessage(&$message) {
     $message = implode($newLineOperators['p']['oper'], $htmlMsg);
   }
 
+  /**
+   * Render html from rows
+   * @param  array $rows   Array of \Civi\Token\TokenRow
+   * @param  string $msgPart The name registered with the TokenProcessor
+   * @return string $html  if formValues['is_unit_test'] is true,
+   *                       otherwise outputs document to browser
+   *
+   */
+  public static function renderFromRows($rows, $msgPart, $formValues) {
+    $html = array();
+    foreach ($rows as $row) {
+      $html[] = $row->render($msgPart);
+    }
+
+    if (!empty($formValues['is_unit_test'])) {
+      return $html;
+    }
+
+    if (!empty($html)) {
+      $type = $formValues['document_type'];
+
+      if ($type == 'pdf') {
+        CRM_Utils_PDF_Utils::html2pdf($html, "CiviLetter.pdf", FALSE, $formValues);
+      }
+      else {
+        CRM_Utils_PDF_Document::html2doc($html, "CiviLetter.$type", $formValues);
+      }
+    }
+  }
+
+  /**
+   * List the available tokens
+   * @return array of token name => label
+   */
+  public static function listTokens() {
+    $class = get_called_class();
+    if (method_exists($class, 'createTokenProcessor')) {
+      return $class::createTokenProcessor()->listTokens();
+    }
+  }
+
 }
diff --git a/templates/CRM/Activity/Form/Task/PDF.tpl b/templates/CRM/Activity/Form/Task/PDF.tpl
new file mode 100644
index 000000000000..ce7d0ef69f3e
--- /dev/null
+++ b/templates/CRM/Activity/Form/Task/PDF.tpl
@@ -0,0 +1,30 @@
+{*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 5                                                  |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*}
+<div class="crm-form-block crm-block crm-contact-task-pdf-form-block">
+  <div class="messages status no-popup">{include file="CRM/Activity/Form/Task.tpl"}</div>
+    {include file="CRM/Contact/Form/Task/PDFLetterCommon.tpl"}
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+</div>
diff --git a/tests/phpunit/CRM/Activity/Form/Task/PDFLetterCommonTest.php b/tests/phpunit/CRM/Activity/Form/Task/PDFLetterCommonTest.php
new file mode 100644
index 000000000000..143747362148
--- /dev/null
+++ b/tests/phpunit/CRM/Activity/Form/Task/PDFLetterCommonTest.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * Class CRM_Activity_Form_Task_PDFLetterCommonTest
+ * @group headless
+ */
+class CRM_Activity_Form_Task_PDFLetterCommonTest extends CiviUnitTestCase {
+
+  public function setUp() {
+    $this->useTransaction(TRUE);
+    parent::setUp();
+  }
+
+  public function tearDown() {
+    parent::tearDown();
+  }
+
+  public function testCreateDocumentBasicTokens() {
+    $activity = $this->activityCreate();
+    $data = [
+      ["Subject: {activity.subject}", "Subject: Discussion on warm beer"],
+      ["Date: {activity.activity_date_time}", "Date: " . \CRM_Utils_Date::customFormat(date('Ymd')) . " 12:00 AM"],
+      ["Duration: {activity.duration}", "Duration: 90"],
+      ["Location: {activity.location}", "Location: Baker Street"],
+      ["Details: {activity.details}", "Details: Lets schedule a meeting"],
+      ["Status ID: {activity.status_id}", "Status ID: 1"],
+      ["Status: {activity.status}", "Status: Scheduled"],
+      ["Activity Type ID: {activity.activity_type_id}", "Activity Type ID: 1"],
+      ["Activity Type: {activity.activity_type}", "Activity Type: Meeting"],
+      ["Activity ID: {activity.activity_id}", "Activity ID: " . $activity['id']],
+    ];
+    $html_message = "\n" . implode("\n", CRM_Utils_Array::collect('0', $data)) . "\n";
+    $output = CRM_Activity_Form_Task_PDFLetterCommon::createDocument([$activity['id']], $html_message, ['is_unit_test' => TRUE]);
+
+    // Check some basic fields
+    foreach ($data as $line) {
+      $this->assertContains("\n" . $line[1] . "\n", $output[0]);
+    }
+  }
+
+  public function testCreateDocumentCustomFieldTokens() {
+    // Set up custom group, and field
+    // returns custom_group_id, custom_field_id, custom_field_option_group_id, custom_field_group_options
+    $cg = $this->entityCustomGroupWithSingleStringMultiSelectFieldCreate("MyCustomField", "ActivityTest.php");
+    $cf = 'custom_' . $cg['custom_field_id'];
+    foreach (array_keys($cg['custom_field_group_options']) as $option) {
+      $activity = $this->activityCreate([$cf => $option]);
+      $activities[] = [
+        'id' => $activity['id'],
+        'option' => $option,
+      ];
+    }
+
+    $html_message = "Custom: {activity.$cf}";
+    $activityIds = CRM_Utils_Array::collect('id', $activities);
+    $output = CRM_Activity_Form_Task_PDFLetterCommon::createDocument($activityIds, $html_message, ['is_unit_test' => TRUE]);
+    // Should have one row of output per activity
+    $this->assertEquals(count($activities), count($output));
+
+    // Check each line has the correct substitution
+    foreach ($output as $key => $line) {
+      $this->assertEquals($line, "Custom: " . $cg['custom_field_group_options'][$activities[$key]['option']]);
+    }
+  }
+
+  public function testCreateDocumentSpecialTokens() {
+    $activity = $this->activityCreate();
+    $data = [
+      ["Source First Name: {activity.source_first_name}", "Source First Name: Anthony"],
+      ["Target N First Name: {activity.target_N_first_name}", "Target N First Name: Julia"],
+      ["Target 0 First Name: {activity.target_0_first_name}", "Target 0 First Name: Julia"],
+      ["Target 1 First Name: {activity.target_1_first_name}", "Target 1 First Name: Julia"],
+      ["Target 2 First Name: {activity.target_2_first_name}", "Target 2 First Name: "],
+      ["Assignee N First Name: {activity.target_N_first_name}", "Assignee N First Name: Julia"],
+      ["Assignee 0 First Name: {activity.target_0_first_name}", "Assignee 0 First Name: Julia"],
+      ["Assignee 1 First Name: {activity.target_1_first_name}", "Assignee 1 First Name: Julia"],
+      ["Assignee 2 First Name: {activity.target_2_first_name}", "Assignee 2 First Name: "],
+      ["Assignee Count: {activity.assignees_count}", "Assignee Count: 1"],
+      ["Target Count: {activity.targets_count}", "Target Count: 1"],
+    ];
+    $html_message = "\n" . implode("\n", CRM_Utils_Array::collect('0', $data)) . "\n";
+    $output = CRM_Activity_Form_Task_PDFLetterCommon::createDocument([$activity['id']], $html_message, ['is_unit_test' => TRUE]);
+
+    foreach ($data as $line) {
+      $this->assertContains("\n" . $line[1] . "\n", $output[0]);
+    }
+  }
+
+  public function testCreateDocumentUnknownTokens() {
+    $activity = $this->activityCreate();
+    $html_message = "Unknown token: {activity.something_unknown}";
+    $output = CRM_Activity_Form_Task_PDFLetterCommon::createDocument([$activity['id']], $html_message, ['is_unit_test' => TRUE]);
+    // Unknown tokens should be left alone
+    $this->assertEquals($output[0], $html_message);
+  }
+
+}
diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index 39ab293589a2..abb6b55e68c9 100644
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -1789,8 +1789,7 @@ public function activityCreate($params = array()) {
     $params = array_merge(array(
       'subject' => 'Discussion on warm beer',
       'activity_date_time' => date('Ymd'),
-      'duration_hours' => 30,
-      'duration_minutes' => 20,
+      'duration' => 90,
       'location' => 'Baker Street',
       'details' => 'Lets schedule a meeting',
       'status_id' => 1,