Merge "re-draw conversation attachment views on changes"