The Byte Stops Here

Has anyone encountered this issue before?

All emails seem to go into the UnDelivr folder, and each email has "server:  ${mailServer}:25" in the header instead of the valid mail server.

Beside the fact that this is an annoying function of CF Mail (hard coded values, when it should just use the default in CFAdmin), I'm wondering why every other value is correct except this one.

Now I have to do a find and replace for hundreds of emails, fun!

Any ideas?

UPDATE: Mail.log shows: "Unknown SMTP host: ${mailServer}"

UPDATE: I simply deleted the whole "server" line and the files went through using the default mail server. I wonder why we need that line in the file now!