FIX: Return-Path header is landing in spam boxes (#2985)

If the Return-Path header does not match the From header, emails are significantly more likely to be blocked by spam filters.

This patch forces the return header to match the from address without having to change php.ini and therefore works properly on servers that have multiple apps sending from multiple email addresses for example shared hosting, multiple support emails in one instance etc.