[Bug 226490] New: Merge Review: thunderbird