am ebacbb93: Merge "fix attachment URIs change from causing re-render flash" into jb-ub-mail

* commit 'ebacbb934eefa704f00808d11cc572a7c65c6559':
  fix attachment URIs change from causing re-render flash