Smarter way to check for new messages
Final changes for 1.28v