Merge "Dont bother with senders/ snippet if we have conversation info." into jb-ub-mail