Merge "Marking a conversation unread forces a return to the list." into jb-ub-mail