[Bug 226473] New: Merge Review: system-switch-mail