fixed some bugs for email templates

I have fixed adding merge fields in add and edit email templates.
I have also fixed the bug of invalid parameter when submitting the
edit form but making the parameter null if no parameter is given.
Lastly, I have fixed a css bug that seems to only appear on Safari
5.1.7 (Snow Leopard) by adding a width to the submit button.