Merge pull request #589 from TitanNano/dev

chat settings fix and improvements