Merge "don't crash on old cached JSON accounts" into jb-ub-mail