am e12bda10: Merge "Linkify email addresses only." into jb-ub-mail-ur10

* commit 'e12bda101b4a677d201e42e81f1a76345d8ecdd4':
  Linkify email addresses only.