Switch back to Sender/From header strategy