Merge "prevent crash with bad help url" into jb-ub-mail