Lines in the messages matching /^From / should be escaped (with a dash), but it's usually better to pay attention to the Content-Length and Content-Lines headers, provided they exist.

Please note that rolling your own can cause some unexpected damage, and that it's been done already (usually pretty well (and many times over)), and made available on the CPAN (see the previous posts).

Good luck!