LILY-377: Fixed compose form not being submitted
Merge branch 'feature/LILY-377-sending-an-email-sometimes-doesnt-work' into develop