When editing email templates you have to go hunting for the appropriate tag to use. This is usually an email from the documentation team, or within the online resources.
Can a "merge tag" drop down be added. This can be dynamic so only showing you the tags available for the specific email template type (tenancies/sales etc) you are editing.
I attach a screenshot of similar functionality that GravityForms use, which is a superb feature.