cursor done better, fixed for chat windows
Merge pull request #281 from JFreegman/master

cursor done better, fixed for chat windows