Same here … Had a block inserted in the new order mail template (terms and conditions). Just removed this block and added the ToC content hard coded. Now the problem is gone.
