Merge branch '1242-display-image-attachments' into 'master'

[android] refactor conversation items and view holders

See merge request !984
2 jobs from master in 11 minutes and 27 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #2738
test

00:11:27

failed #2737
test

00:09:59