Merge pull request #18296 from mcav/email-toolbar

Bug 993215 - [Email] toolbar covers the bottom line of long emails. r=jrburke