am ffc9c39a: Merge "Improve display of attachments in pop" into jb-ub-mail-ur10

* commit 'ffc9c39a97ee3ea84e11e31a92eb4ef7cb619220':
  Improve display of attachments in pop