Merge "Add snippet logic when marking read/ unread." into jb-ub-mail