Tooltips should include machine name

When a tooltip is received, it is impossible to tell which machine is generating the message. The tooltip should have the machine name within it.