Add Notification Badge on app icon when a message arrives.
Another thing, when i right swipe heads up notification or drawer notification, it should be marked unread and notification badge on app should remain untill i open app or click on notification to open message.