Merge "Remove potential bug" into jb-ub-mail