We have just migrated to Lightning and our Account Dev team is recreating their email templates and having trouble.  In classic they could use one template that was for both Leads and Contacts.  Is there any way to do that in Lightning?  If so, can someone please provide some instructions?  The email templates are simple.  They just want something along the lines of Dear First Name (this was no problem).  In the body of the email they want to mention the recipients Company Name.  This is where we have trouble.  We can pull in the lead CompanyName but nothing seems to work for a Contacts Company Name.  I've read that you can add a formula field that just pulls in the company name but do we really need to add another field to accomplish this?  Thanks for any help.