Use user specified email address in Reply-To header instead of sender

This prevents problems when the address' domain has published an SPF record and the receiving mail server checks that record.

Also fix some indentation inconsistencies.