Fix EmailComposer bugs