Fix functions renamed, but old calls remaining
Skip charset setting if missing in email