Gift Certificate invoice missing info

When a customer buys a gift certificate, in the invoice that is sent there is a billing and shipping information listed, but there is no mention of the address where the customers wants to mail the certificate, or any information about the email address picked in the case of delivery via email.

By showing the shipping address of the customer who bought the certificate, it seems like the gift certificate will be mailed to the customer itself.

Plus if a customer buys multiple gift certificates and choose to deliver them via email, in the invoices that he receives there is no mention of these email addresses, so how would the customer be able to tell which one was sent where?

Is there something I need to enable to have this information displayed in the invoice?

Is anyone else using gift certificates? How did you handle this issue?