am f46bd06c: Merge "Fix issue #6579824: Email crash observed after updating..." into jb-dev

* commit 'f46bd06c6822752acd24265a7db5c86d6036bc38':
  Fix issue #6579824: Email crash observed after updating...