Bug 935991 - [Messages]Modified the Order of menu options with tests r=rwaldron