Merge pull request #71 from thequbit/master

removed uncompleted code
fixed logic around markign messages as read