am d845e632: Merge "Add missed cases to custom from address logic." into jb-ub-mail

* commit 'd845e63239686e390a3b1d52b6b8de7ae71e7066':
  Add missed cases to custom from address logic.