include SubjectEmailMap ...

How did work before?