Bug_935991:[Messaging]Modified the Order of menu options and updated testcase