Merge pull request #17561 from jrburke/bug985598-email-double-activity-blank

Bug 985598 - [email] Double-triggering of share/new activity by clicking... r=asuth