--- 1/draft-ietf-jmap-mdn-11.txt	2020-06-25 09:13:15.981962708 -0700
+++ 2/draft-ietf-jmap-mdn-12.txt	2020-06-25 09:13:16.009963423 -0700
@@ -1,18 +1,18 @@
 
 JMAP                                                     R. Ouazana, Ed.
 Internet-Draft                                                  Linagora
-Intended status: Standards Track                           June 22, 2020
-Expires: December 24, 2020
+Intended status: Standards Track                           June 25, 2020
+Expires: December 27, 2020
 
           Handling Message Disposition Notification with JMAP
-                         draft-ietf-jmap-mdn-11
+                         draft-ietf-jmap-mdn-12
 
 Abstract
 
    JMAP ([RFC8620] - JSON Meta Application Protocol) is a generic
    protocol for synchronising data, such as mail, calendars or contacts,
    between a client and a server.  It is optimised for mobile and web
    environments, and aims to provide a consistent interface to different
    data types.
 
    JMAP for Mail ([RFC8621] - The JSON Meta Application Protocol (JMAP)
@@ -35,21 +35,21 @@
    Internet-Drafts are working documents of the Internet Engineering
    Task Force (IETF).  Note that other groups may also distribute
    working documents as Internet-Drafts.  The list of current Internet-
    Drafts is at https://datatracker.ietf.org/drafts/current/.
 
    Internet-Drafts are draft documents valid for a maximum of six months
    and may be updated, replaced, or obsoleted by other documents at any
    time.  It is inappropriate to use Internet-Drafts as reference
    material or to cite them other than as "work in progress."
 
-   This Internet-Draft will expire on December 24, 2020.
+   This Internet-Draft will expire on December 27, 2020.
 
 Copyright Notice
 
    Copyright (c) 2020 IETF Trust and the persons identified as the
    document authors.  All rights reserved.
 
    This document is subject to BCP 78 and the IETF Trust's Legal
    Provisions Relating to IETF Documents
    (https://trustee.ietf.org/license-info) in effect on the date of
    publication of this document.  Please review these documents
@@ -228,23 +228,25 @@
 
    o  accountId: "Id" The id of the account to use.
 
    o  identityId: "Id" The id of the Identity to associate with these
       MDN.  The server will use this identity to define the sender of
       the MDN and to set the finalRecipient field.
 
    o  send: "Id[MDN]" A map of creation id (client specified) to MDN
       objects.
 
-   o  onSuccessUpdateEmail: "Id[PatchObject]|null" A map of creation id
-      to an object containing properties to update on the Email object
-      referenced by the "MDN/send" if the sending succeeds.
+   o  onSuccessUpdateEmail: "Id[PatchObject]|null" A map of id to an
+      object containing properties to update on the Email object
+      referenced by the "MDN/send" if the sending succeeds.  This will
+      always be a backreference to the creation id (see example below in
+      Section 3.1).
 
    The response has the following arguments:
 
    o  accountId: "Id" The id of the account used for the call.
 
    o  sent: "Id[MDN]|null" A map of creation id to MDN containing any
       properties that were not set by the client.  This includes any
       properties that were omitted by the client and thus set to a
       default by the server.  This argument is null if no MDN objects
       were successfully sent.
@@ -387,25 +389,21 @@
            "finalRecipient": "rfc822; john@example.com",
            "originalMessageId": "<1521557867.2614.0.camel@apache.org>"
          }
        }
      }, "0" ],
      [ "Email/set", {
        "accountId": "ue150411c",
        "oldState": "23",
        "newState": "42",
        "updated": {
-         "Md45b47b4877521042cec0938": {
-           "keywords": {
-             "$mdnsent": true
-           }
-         }
+         "Md45b47b4877521042cec0938": {}
        }
      }, "0" ]]
 
    If the "$mdnsent" keyword has already been set, the server can answer
    an error:
 
         [[ "MDN/send", {
           "accountId": "ue150411c",
           "notSent": {
             "k1546": {