Fix #271: fix messages icon click

Also fixes #273.