Changed the mail function to explicitly set the "from" address using the -f prefix.