LILY-377: Email compose should now work as intended