Too many carriage returns using HTML in estimates/invoices

We have been working around this issue for a while, having to remember to delete carriage returns when using HTML otherwise we get too many carriage returns!

I happened across this thread from a while back and wondered of the fix applied here was causing the issues? Could we look at undoing that fix and seeing if that fixes this issue? If so then I would suggest a new fix is found for this original issue.