Merge "Add bits of Attachment info to message cursor results"