Fix for message overlap with sidebar - pm #570

Fix for Shippable/pm#570