AGPUSH-795 : fixing the cancel and submit behaviour for compose message options