Hi Tom,
Having already upgraded I can confirm that the email format within the extensions own 'window' is the same as SA1, however there is now the option to select an external HTML file so that might get around your problem here.
I personally don't use the custom made forms that SA creates during the wizard, so I'm afraid I can't comment on that.
Cheers
Ian