Merge "JSON objects for conversation and messageinfo." into jb-ub-mail