In some implementations, a return to sender option can be invoked from within a file editing application when a user has edited a file received as a message attachment. The user can select a file attached to a message from within a messaging application. A file editor can be invoked to open and edit the file. The user can select a return to sender option from within the file editor. In response to the selection of the return to sender option, the edited file can be automatically saved, a reply message can be automatically generated and the edited file can be automatically attached to the reply message.