Update tooltip when changing options on the conversation screen
Merge pull request #560 from voodoochild/master

Update tooltip when changing options on the conversation screen
Merge upstream