Revised MessageViewed logic