Merge "Make "mark unread" close current message"