$localpart = CRM_Core_BAO_MailSettings::defaultLocalpart();
$emailDomain = CRM_Core_BAO_MailSettings::defaultDomain();
$includeMessageId = CRM_Core_BAO_MailSettings::includeMessageId();
-
- if ($includeMessageId && (!array_key_exists('Message-ID', $headers))) {
- $headers['Message-ID'] = '<' . implode($config->verpSeparator,
- array(
- $localpart . $prefix,
- $job_id,
- $event_queue_id,
- $hash,
- )
- ) . "@{$emailDomain}>";
+ $fields = array();
+ $fields[] = 'Message-ID';
+ // CRM-17754 check if Resent-Message-id is set also if not add it in when re-laying reply email
+ if ($prefix == 'r') {
+ $fields[] = 'Resent-Message-ID';
+ }
+ foreach ($fields as $field) {
+ if ($includeMessageId && (!array_key_exists($field, $headers))) {
+ $headers['Message-ID'] = '<' . implode($config->verpSeparator,
+ array(
+ $localpart . $prefix,
+ $job_id,
+ $event_queue_id,
+ $hash,
+ )
+ ) . "@{$emailDomain}>";
+ }
}
+
}
/**
$mailParams['attachments'] = $attachments;
- $mailingSubject = CRM_Utils_Array::value('subject', $pEmails);
- if (is_array($mailingSubject)) {
- $mailingSubject = implode('', $mailingSubject);
+ $mailParams['Subject'] = CRM_Utils_Array::value('subject', $pEmails);
+ if (is_array($mailParams['Subject'])) {
+ $mailParams['Subject'] = implode('', $mailParams['Subject']);
}
- $mailParams['Subject'] = $mailingSubject;
$mailParams['toName'] = CRM_Utils_Array::value('display_name',
$contact
//CRM-5058
//token replacement of subject
- $headers['Subject'] = $mailingSubject;
+ $headers['Subject'] = $mailParams['Subject'];
CRM_Utils_Mail::setMimeParams($message);
$headers = $message->headers($headers);