Multiple email addresses for a contact/client/lead (In Progress)

Some of our clients contact us from multiple email addresses. It would be great to be able to put multiple email addresses into a client/contact/lead record and have that mail all track against that record.