Custom Fields

I have been working within the core of the Marketpress plugin (Bad idea I know) but I want to make sure this works. Basically I want to turn the shipping form into a form that includes a number of new fields. I have managed to add a 'test' custom field that is shown in the shipping form and also the details display in the 'managed orders' section.

The problem is this new field called 'test; will not show up in the confirmation email sent to me and the customer. Is there somewhere in the code I need to add these custom fields?

Also is there anyway at all I can either add html to this email. if not could I pass the 'order details' into something like gravity forms so I can make a much nicer email to send to people?

Thanks

Peter