An end user application running on a local client computer stores activity data and comment data for an electronic document. Activity data includes data indicative of actions taken by users and associated with the electronic document, such as actions with respect to the electronic document itself, and actions with respect to comments, such as adding a comment and marking a comment as resolved. A displayed comment or comment thread can be marked as resolved in response to a user action. A corresponding action is stored in the activity data. Activity data can be displayed while the electronic document is open in the end user application. An action of resolving a comment can be accessed in the displayed activity data. In response to receiving an input associated with a displayed action of resolving a comment, the comment can be marked as unresolved.