Got it... I had added a column for name to the directory merge file, even though I then realised I wouldn't be able to use this mergefield in the email where I would have liked. Removing it seemed to solve the line break issue.

I think I'm ready for the mailshot proper now! Fingers crossed...