Fixed mail script to/from fields