diff --git a/17.md b/17.md
index b56e4eb8..7053810c 100644
--- a/17.md
+++ b/17.md
@@ -156,6 +156,12 @@ Relays MAY protect message metadata by only serving `kind:1059` events to users
 
 Clients SHOULD guide users to keep `kind:10050` lists small (1-3 relays) and SHOULD spread them to as many relays as viable.
 
+## Delete and Edit
+
+In addition to the deletion behavior specified in [NIP 59](59.md), in which gift wraps can be deleted by the `p`-tagged recipient, clients MAY also allow users to delete messages by wrapping a `kind:5` delete event in a `kind:1059` gift wrap and sending it to the recipient as part of the conversation. Clients SHOULD remove deleted messages from the conversation, or indicate whether a message has been deleted.
+
+Clients MAY implement edit by deleting an event and publishing another one with the same timestamp.
+
 ## Benefits & Limitations
 
 This NIP offers the following privacy and security features: