Fix wording of subject of events created from emails.

"Event about to <subject>" sounds weird, let's just use the subject
directly, which is also more in line with bug 352168.

This also fixes the corresponding unit tests that regressed in c988586f.