Add more support for Reply-To: headers on email