A client computer with one or more processors and memory transmits, to a server system, a search query including one or more query terms and receives, from the sever system, a response to the search query including a search result. The client computer displays a representation of a respective message from the search result, where the respective message includes a message body and a respective attachment with attachment content. When the attachment content of the respective attachment includes content that matches a query term from the search query, displaying the respective message includes highlighting a representation of the respective attachment in the message. When the attachment content of the respective attachment does not include content that matches a query term from the search query, displaying the respective message includes forgoing highlighting the representation of the respective attachment in the message.