Added initial and unread message conditions