Techniques are described for managing drafts of an electronic document (e.g., an electronic note, an electronic message, an electronic calendar invitation, and/or other types of electronic documents) between client devices. Such an electronic document can be composed using different clients, such that composing the document can be continued using different clients. A draft of an electronic document can be stored by clients and/or the message management service as a metadata. A message management service can be implemented as an intermediary computing system to manage a current version of a draft in local storage when a draft is composed using a client device. The message management service can manage version information of a draft that is exists, if any, on each of the client devices. The message management service can synchronize a draft of the message with client devices when a draft is composed using a client device.