am 5ecce361: Merge "Remove potential bug" into jb-ub-mail

* commit '5ecce361d410edbe7e32b6ea9627f8fced6ea1bd':
  Remove potential bug