Merge "message "serverId" field is a string, not a long" into jb-ub-mail