Adjust MTA's to include an MTA id (in the current code it's the hostname)
Change sender to pass the id to recorder.