Fix 2.3 plain text emails