NXP-14018: Move comments in emails