Changed pwd slightly because escaping is painful.

Also, note for Mailtest.php: don't upload, but keeping because it's
useful as a stand-alone tester for anything.