[Bug 226490] Merge Review: thunderbird