Fix issue with message inline editor if no dropdown exists
Merge branch 'refs/heads/2.0'