[Scott MacVicar]

Just to inform you that this hack is producing invalid Mail headers.

$headers = preg_replace('/Return-Path.*/', 'Return-Path: ' . $vbulletin->options['vbouncer_spool_account'], $headers, 1);

That will match up to the \r and replace it, the end result is that the header has \n instead of \r\n.

If you could fix this it would be awesome, if you can't or aren't around any more i'll speak to Marco about manually updating your hack for you.

This affects Qmail installs and potentially the SMTP mail sender.

Quick Fix, i think but haven't tested is adding $

$headers = preg_replace('/Return-Path.*$/', 'Return-Path: ' . $vbulletin->options['vbouncer_spool_account'], $headers, 1);