E-mail templates - Contacts and Leads

Hello, 

We've created many e-mail templates, which are using some custom macros. The macro source is set on "Contact". 

Selecting a template from a contact is working fine, but when we try to do the same from a lead, it's impossible to see the templates we've made. 

I tried to modify an e-mail template, setting its macro-source on "lead" instead of "contact. In this case it's possible to select and use this template from the lead, but then it's not accessible from the contact...

As it is apparently possible to select only one macro source per e-mail, how can we  have these templates accessibles from contacts AND leads? 



Thank you! 



Best,