Merge "Remove 'send email' checkbox from reply box on change screen" into stable-2.9