Now, you can have custom fields available inside the merge fields. :)
You can use the lead and customer's merge field inside your emails and email templates.
You can use your company's and customer's merge field while formatting the address information in Invoices.
You can use Lead's merge fields inside Proposals.
Now you can configure subjects for email templates as well.