Bug 961950 - Replace message edit button with option menu contains delete / settings option
Merge pull request #15753 from steveck-chung/bug-961950

Bug 961950 - Replace message edit button with option menu contains delete / settings option