More fixes.

Does the 'from' field really need it in e-mail format?