[funkydunk]

Have you tried using the php code:

nl2br($variable);

where it picks up the line returns (\n) from the non html emails and converts them to a
hence new line 2 br.

Haven't though about how you would integerate this in yet...