Bug 802643 - Remove activity workaround in email app