-{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}{$greeting},{/if}
+{assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if}
{ts 1=$next_payment|truncate:10:''|crmDate}This is a reminder that the next payment on your pledge is due on %1.{/ts}
{ts}Due Date{/ts}: {$scheduled_payment_date|truncate:10:''|crmDate}
{if $contribution_page_id}
-{capture assign=contributionUrl}{crmURL p='civicrm/contribute/transact' q="reset=1&id=`$contribution_page_id`&cid=`$contact.contact_id`&pledgeId=`$pledge_id`&cs=`$checksumValue`" a=true h=0}{/capture}
+{capture assign=contributionUrl}{crmURL p='civicrm/contribute/transact' q="reset=1&id=`$contribution_page_id`&cid=`{contact.id}`&pledgeId=`$pledge_id`&cs=`$checksumValue`" a=true h=0 fe=1}{/capture}
Click this link to go to a web page where you can make your payment online:
{$contributionUrl}
{else}
{ts}Please mail your payment to{/ts}:
-{$domain.address}
+{domain.address}
{/if}
===========================================================
{ts}Total Pledge Amount{/ts}: {$amount|crmMoney:$currency}
{ts}Total Paid{/ts}: {$amount_paid|crmMoney:$currency}
-{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions
+{ts 1='{domain.phone}' 2='{domain.email}'} Please contact us at %1 or send email to %2 if you have questions
or need to modify your payment schedule.{/ts}