diff --git a/lib/shared/dm-ops/dm-op-specs.js b/lib/shared/dm-ops/dm-op-specs.js
index c0060ec25..c0e9dc348 100644
--- a/lib/shared/dm-ops/dm-op-specs.js
+++ b/lib/shared/dm-ops/dm-op-specs.js
@@ -1,41 +1,43 @@
 // @flow
 
 import { addMembersSpec } from './add-members-spec.js';
 import { addViewerToThreadMembersSpec } from './add-viewer-to-thread-members-spec.js';
 import { changeThreadReadStatusSpec } from './change-thread-read-status-spec.js';
 import { changeThreadSettingsSpec } from './change-thread-settings-spec.js';
 import { changeThreadSubscriptionSpec } from './change-thread-subscription.js';
 import { createEntrySpec } from './create-entry-spec.js';
 import { createSidebarSpec } from './create-sidebar-spec.js';
 import { createThreadSpec } from './create-thread-spec.js';
 import { deleteEntrySpec } from './delete-entry-spec.js';
 import type { DMOperationSpec } from './dm-op-spec.js';
+import { editEntrySpec } from './edit-entry-spec.js';
 import { joinThreadSpec } from './join-thread-spec.js';
 import { leaveThreadSpec } from './leave-thread-spec.js';
 import { removeMembersSpec } from './remove-members-spec.js';
 import { sendEditMessageSpec } from './send-edit-message-spec.js';
 import { sendMultimediaMessageSpec } from './send-multimedia-message-spec.js';
 import { sendReactionMessageSpec } from './send-reaction-message-spec.js';
 import { sendTextMessageSpec } from './send-text-message-spec.js';
 import { type DMOperationType, dmOperationTypes } from '../../types/dm-ops.js';
 
 export const dmOpSpecs: {
   +[DMOperationType]: DMOperationSpec<any>,
 } = Object.freeze({
   [dmOperationTypes.CREATE_THREAD]: createThreadSpec,
   [dmOperationTypes.CREATE_SIDEBAR]: createSidebarSpec,
   [dmOperationTypes.SEND_TEXT_MESSAGE]: sendTextMessageSpec,
   [dmOperationTypes.SEND_MULTIMEDIA_MESSAGE]: sendMultimediaMessageSpec,
   [dmOperationTypes.SEND_REACTION_MESSAGE]: sendReactionMessageSpec,
   [dmOperationTypes.SEND_EDIT_MESSAGE]: sendEditMessageSpec,
   [dmOperationTypes.ADD_MEMBERS]: addMembersSpec,
   [dmOperationTypes.ADD_VIEWER_TO_THREAD_MEMBERS]: addViewerToThreadMembersSpec,
   [dmOperationTypes.JOIN_THREAD]: joinThreadSpec,
   [dmOperationTypes.LEAVE_THREAD]: leaveThreadSpec,
   [dmOperationTypes.REMOVE_MEMBERS]: removeMembersSpec,
   [dmOperationTypes.CHANGE_THREAD_SETTINGS]: changeThreadSettingsSpec,
   [dmOperationTypes.CHANGE_THREAD_SUBSCRIPTION]: changeThreadSubscriptionSpec,
   [dmOperationTypes.CHANGE_THREAD_READ_STATUS]: changeThreadReadStatusSpec,
   [dmOperationTypes.CREATE_ENTRY]: createEntrySpec,
   [dmOperationTypes.DELETE_ENTRY]: deleteEntrySpec,
+  [dmOperationTypes.EDIT_ENTRY]: editEntrySpec,
 });
diff --git a/lib/shared/dm-ops/edit-entry-spec.js b/lib/shared/dm-ops/edit-entry-spec.js
new file mode 100644
index 000000000..f84a30124
--- /dev/null
+++ b/lib/shared/dm-ops/edit-entry-spec.js
@@ -0,0 +1,99 @@
+// @flow
+
+import uuid from 'uuid';
+
+import type {
+  DMOperationSpec,
+  ProcessDMOperationUtilities,
+} from './dm-op-spec.js';
+import type { DMEditEntryOperation } from '../../types/dm-ops.js';
+import type { ThickRawEntryInfo } from '../../types/entry-types.js';
+import { messageTypes } from '../../types/message-types-enum.js';
+import { updateTypes } from '../../types/update-types-enum.js';
+import type { EntryUpdateInfo } from '../../types/update-types.js';
+import { dateFromString } from '../../utils/date-utils.js';
+import { rawMessageInfoFromMessageData } from '../message-utils.js';
+
+function createMessageDataFromDMOperation(dmOperation: DMEditEntryOperation) {
+  const { threadID, creatorID, creationTime, entryID, entryDate, text } =
+    dmOperation;
+  return {
+    type: messageTypes.EDIT_ENTRY,
+    threadID,
+    creatorID,
+    entryID,
+    time: creationTime,
+    date: entryDate,
+    text,
+  };
+}
+
+const editEntrySpec: DMOperationSpec<DMEditEntryOperation> = Object.freeze({
+  notificationsCreationData: async (dmOperation: DMEditEntryOperation) => {
+    const messageData = createMessageDataFromDMOperation(dmOperation);
+    return { messageDatas: [messageData] };
+  },
+  processDMOperation: async (dmOperation: DMEditEntryOperation) => {
+    const {
+      threadID,
+      creatorID,
+      creationTime,
+      time,
+      entryID,
+      entryDate: dateString,
+      text,
+      messageID,
+    } = dmOperation;
+
+    const messageData = createMessageDataFromDMOperation(dmOperation);
+    const rawMessageInfos = [
+      rawMessageInfoFromMessageData(messageData, messageID),
+    ];
+
+    const date = dateFromString(dateString);
+    const rawEntryInfo: ThickRawEntryInfo = {
+      id: entryID,
+      threadID,
+      text,
+      year: date.getFullYear(),
+      month: date.getMonth() + 1,
+      day: date.getDate(),
+      creationTime,
+      creatorID,
+      thick: true,
+      deleted: false,
+      lastUpdatedTime: time,
+    };
+
+    const entryUpdateInfo: EntryUpdateInfo = {
+      entryInfo: rawEntryInfo,
+      type: updateTypes.UPDATE_ENTRY,
+      id: uuid.v4(),
+      time,
+    };
+
+    return {
+      rawMessageInfos,
+      updateInfos: [entryUpdateInfo],
+    };
+  },
+  canBeProcessed(
+    dmOperation: DMEditEntryOperation,
+    viewerID: string,
+    utilities: ProcessDMOperationUtilities,
+  ) {
+    if (utilities.threadInfos[dmOperation.threadID]) {
+      return { isProcessingPossible: true };
+    }
+    return {
+      isProcessingPossible: false,
+      reason: {
+        type: 'missing_thread',
+        threadID: dmOperation.threadID,
+      },
+    };
+  },
+  supportsAutoRetry: true,
+});
+
+export { editEntrySpec };
diff --git a/lib/types/dm-ops.js b/lib/types/dm-ops.js
index 76fef984a..a0bbf11db 100644
--- a/lib/types/dm-ops.js
+++ b/lib/types/dm-ops.js
@@ -1,501 +1,529 @@
 // @flow
 
 import t, { type TInterface, type TUnion } from 'tcomb';
 
 import { clientAvatarValidator, type ClientAvatar } from './avatar-types.js';
 import { type Media, mediaValidator } from './media-types.js';
 import type { RawMessageInfo } from './message-types.js';
 import type { NotificationsCreationData } from './notif-types.js';
 import type { OutboundP2PMessage } from './sqlite-types.js';
 import {
   type ThreadSubscription,
   threadSubscriptionValidator,
 } from './subscription-types.js';
 import {
   type NonSidebarThickThreadType,
   nonSidebarThickThreadTypes,
   type ThickThreadType,
   thickThreadTypeValidator,
 } from './thread-types-enum.js';
 import {
   threadTimestampsValidator,
   type ThreadTimestamps,
 } from './thread-types.js';
 import type { ClientUpdateInfo } from './update-types.js';
 import { values } from '../utils/objects.js';
 import { tColor, tShape, tString, tUserID } from '../utils/validation-utils.js';
 
 export const dmOperationTypes = Object.freeze({
   CREATE_THREAD: 'create_thread',
   CREATE_SIDEBAR: 'create_sidebar',
   SEND_TEXT_MESSAGE: 'send_text_message',
   SEND_MULTIMEDIA_MESSAGE: 'send_multimedia_message',
   SEND_REACTION_MESSAGE: 'send_reaction_message',
   SEND_EDIT_MESSAGE: 'send_edit_message',
   ADD_MEMBERS: 'add_members',
   ADD_VIEWER_TO_THREAD_MEMBERS: 'add_viewer_to_thread_members',
   JOIN_THREAD: 'join_thread',
   LEAVE_THREAD: 'leave_thread',
   REMOVE_MEMBERS: 'remove_members',
   CHANGE_THREAD_SETTINGS: 'change_thread_settings',
   CHANGE_THREAD_SUBSCRIPTION: 'change_thread_subscription',
   CHANGE_THREAD_READ_STATUS: 'change_thread_read_status',
   CREATE_ENTRY: 'create_entry',
   DELETE_ENTRY: 'delete_entry',
+  EDIT_ENTRY: 'edit_entry',
 });
 export type DMOperationType = $Values<typeof dmOperationTypes>;
 
 type MemberIDWithSubscription = {
   +id: string,
   +subscription: ThreadSubscription,
 };
 export const memberIDWithSubscriptionValidator: TInterface<MemberIDWithSubscription> =
   tShape<MemberIDWithSubscription>({
     id: tUserID,
     subscription: threadSubscriptionValidator,
   });
 
 export type CreateThickRawThreadInfoInput = {
   +threadID: string,
   +threadType: ThickThreadType,
   +creationTime: number,
   +parentThreadID?: ?string,
   +allMemberIDsWithSubscriptions: $ReadOnlyArray<MemberIDWithSubscription>,
   +roleID: string,
   +unread: boolean,
   +timestamps: ThreadTimestamps,
   +name?: ?string,
   +avatar?: ?ClientAvatar,
   +description?: ?string,
   +color?: ?string,
   +containingThreadID?: ?string,
   +sourceMessageID?: ?string,
   +repliesCount?: ?number,
   +pinnedCount?: ?number,
 };
 export const createThickRawThreadInfoInputValidator: TInterface<CreateThickRawThreadInfoInput> =
   tShape<CreateThickRawThreadInfoInput>({
     threadID: t.String,
     threadType: thickThreadTypeValidator,
     creationTime: t.Number,
     parentThreadID: t.maybe(t.String),
     allMemberIDsWithSubscriptions: t.list(memberIDWithSubscriptionValidator),
     roleID: t.String,
     unread: t.Boolean,
     timestamps: threadTimestampsValidator,
     name: t.maybe(t.String),
     avatar: t.maybe(clientAvatarValidator),
     description: t.maybe(t.String),
     color: t.maybe(t.String),
     containingThreadID: t.maybe(t.String),
     sourceMessageID: t.maybe(t.String),
     repliesCount: t.maybe(t.Number),
     pinnedCount: t.maybe(t.Number),
   });
 
 export type DMCreateThreadOperation = {
   +type: 'create_thread',
   +threadID: string,
   +creatorID: string,
   +time: number,
   +threadType: NonSidebarThickThreadType,
   +memberIDs: $ReadOnlyArray<string>,
   +roleID: string,
   +newMessageID: string,
 };
 export const dmCreateThreadOperationValidator: TInterface<DMCreateThreadOperation> =
   tShape<DMCreateThreadOperation>({
     type: tString(dmOperationTypes.CREATE_THREAD),
     threadID: t.String,
     creatorID: tUserID,
     time: t.Number,
     threadType: t.enums.of(values(nonSidebarThickThreadTypes)),
     memberIDs: t.list(tUserID),
     roleID: t.String,
     newMessageID: t.String,
   });
 
 export type DMCreateSidebarOperation = {
   +type: 'create_sidebar',
   +threadID: string,
   +creatorID: string,
   +time: number,
   +parentThreadID: string,
   +memberIDs: $ReadOnlyArray<string>,
   +sourceMessageID: string,
   +roleID: string,
   +newSidebarSourceMessageID: string,
   +newCreateSidebarMessageID: string,
 };
 export const dmCreateSidebarOperationValidator: TInterface<DMCreateSidebarOperation> =
   tShape<DMCreateSidebarOperation>({
     type: tString(dmOperationTypes.CREATE_SIDEBAR),
     threadID: t.String,
     creatorID: tUserID,
     time: t.Number,
     parentThreadID: t.String,
     memberIDs: t.list(tUserID),
     sourceMessageID: t.String,
     roleID: t.String,
     newSidebarSourceMessageID: t.String,
     newCreateSidebarMessageID: t.String,
   });
 
 export type DMSendTextMessageOperation = {
   +type: 'send_text_message',
   +threadID: string,
   +creatorID: string,
   +time: number,
   +messageID: string,
   +text: string,
 };
 export const dmSendTextMessageOperationValidator: TInterface<DMSendTextMessageOperation> =
   tShape<DMSendTextMessageOperation>({
     type: tString(dmOperationTypes.SEND_TEXT_MESSAGE),
     threadID: t.String,
     creatorID: tUserID,
     time: t.Number,
     messageID: t.String,
     text: t.String,
   });
 
 export type DMSendMultimediaMessageOperation = {
   +type: 'send_multimedia_message',
   +threadID: string,
   +creatorID: string,
   +time: number,
   +messageID: string,
   +media: $ReadOnlyArray<Media>,
 };
 export const dmSendMultimediaMessageOperationValidator: TInterface<DMSendMultimediaMessageOperation> =
   tShape<DMSendMultimediaMessageOperation>({
     type: tString(dmOperationTypes.SEND_MULTIMEDIA_MESSAGE),
     threadID: t.String,
     creatorID: tUserID,
     time: t.Number,
     messageID: t.String,
     media: t.list(mediaValidator),
   });
 
 export type DMSendReactionMessageOperation = {
   +type: 'send_reaction_message',
   +threadID: string,
   +creatorID: string,
   +time: number,
   +messageID: string,
   +targetMessageID: string,
   +reaction: string,
   +action: 'add_reaction' | 'remove_reaction',
 };
 export const dmSendReactionMessageOperationValidator: TInterface<DMSendReactionMessageOperation> =
   tShape<DMSendReactionMessageOperation>({
     type: tString(dmOperationTypes.SEND_REACTION_MESSAGE),
     threadID: t.String,
     creatorID: tUserID,
     time: t.Number,
     messageID: t.String,
     targetMessageID: t.String,
     reaction: t.String,
     action: t.enums.of(['add_reaction', 'remove_reaction']),
   });
 
 export type DMSendEditMessageOperation = {
   +type: 'send_edit_message',
   +threadID: string,
   +creatorID: string,
   +time: number,
   +messageID: string,
   +targetMessageID: string,
   +text: string,
 };
 export const dmSendEditMessageOperationValidator: TInterface<DMSendEditMessageOperation> =
   tShape<DMSendEditMessageOperation>({
     type: tString(dmOperationTypes.SEND_EDIT_MESSAGE),
     threadID: t.String,
     creatorID: tUserID,
     time: t.Number,
     messageID: t.String,
     targetMessageID: t.String,
     text: t.String,
   });
 
 type DMAddMembersBase = {
   +editorID: string,
   +time: number,
   +addedUserIDs: $ReadOnlyArray<string>,
 };
 const dmAddMembersBaseValidatorShape = {
   editorID: tUserID,
   time: t.Number,
   addedUserIDs: t.list(tUserID),
 };
 
 export type DMAddMembersOperation = $ReadOnly<{
   +type: 'add_members',
   +threadID: string,
   +messageID: string,
   ...DMAddMembersBase,
 }>;
 export const dmAddMembersOperationValidator: TInterface<DMAddMembersOperation> =
   tShape<DMAddMembersOperation>({
     type: tString(dmOperationTypes.ADD_MEMBERS),
     threadID: t.String,
     messageID: t.String,
     ...dmAddMembersBaseValidatorShape,
   });
 
 export type DMAddViewerToThreadMembersOperation = $ReadOnly<{
   +type: 'add_viewer_to_thread_members',
   +messageID: ?string,
   +existingThreadDetails: CreateThickRawThreadInfoInput,
   ...DMAddMembersBase,
 }>;
 export const dmAddViewerToThreadMembersValidator: TInterface<DMAddViewerToThreadMembersOperation> =
   tShape<DMAddViewerToThreadMembersOperation>({
     type: tString(dmOperationTypes.ADD_VIEWER_TO_THREAD_MEMBERS),
     messageID: t.maybe(t.String),
     existingThreadDetails: createThickRawThreadInfoInputValidator,
     ...dmAddMembersBaseValidatorShape,
   });
 
 export type DMJoinThreadOperation = {
   +type: 'join_thread',
   +joinerID: string,
   +time: number,
   +messageID: string,
   +existingThreadDetails: CreateThickRawThreadInfoInput,
 };
 export const dmJoinThreadOperationValidator: TInterface<DMJoinThreadOperation> =
   tShape<DMJoinThreadOperation>({
     type: tString(dmOperationTypes.JOIN_THREAD),
     joinerID: tUserID,
     time: t.Number,
     messageID: t.String,
     existingThreadDetails: createThickRawThreadInfoInputValidator,
   });
 
 export type DMLeaveThreadOperation = {
   +type: 'leave_thread',
   +editorID: string,
   +time: number,
   +messageID: string,
   +threadID: string,
 };
 export const dmLeaveThreadOperationValidator: TInterface<DMLeaveThreadOperation> =
   tShape<DMLeaveThreadOperation>({
     type: tString(dmOperationTypes.LEAVE_THREAD),
     editorID: tUserID,
     time: t.Number,
     messageID: t.String,
     threadID: t.String,
   });
 
 export type DMRemoveMembersOperation = {
   +type: 'remove_members',
   +editorID: string,
   +time: number,
   +messageID: string,
   +threadID: string,
   +removedUserIDs: $ReadOnlyArray<string>,
 };
 export const dmRemoveMembersOperationValidator: TInterface<DMRemoveMembersOperation> =
   tShape<DMRemoveMembersOperation>({
     type: tString(dmOperationTypes.REMOVE_MEMBERS),
     editorID: tUserID,
     time: t.Number,
     messageID: t.String,
     threadID: t.String,
     removedUserIDs: t.list(tUserID),
   });
 
 export type DMThreadSettingsChanges = {
   +name?: string,
   +description?: string,
   +color?: string,
   +avatar?: ClientAvatar | null,
 };
 
 export type DMChangeThreadSettingsOperation = $ReadOnly<{
   +type: 'change_thread_settings',
   +threadID: string,
   +editorID: string,
   +time: number,
   +changes: DMThreadSettingsChanges,
   +messageIDsPrefix: string,
 }>;
 export const dmChangeThreadSettingsOperationValidator: TInterface<DMChangeThreadSettingsOperation> =
   tShape<DMChangeThreadSettingsOperation>({
     type: tString(dmOperationTypes.CHANGE_THREAD_SETTINGS),
     threadID: t.String,
     editorID: tUserID,
     time: t.Number,
     changes: tShape({
       name: t.maybe(t.String),
       description: t.maybe(t.String),
       color: t.maybe(tColor),
       avatar: t.maybe(clientAvatarValidator),
     }),
     messageIDsPrefix: t.String,
   });
 
 export type DMChangeThreadSubscriptionOperation = {
   +type: 'change_thread_subscription',
   +time: number,
   +threadID: string,
   +creatorID: string,
   +subscription: ThreadSubscription,
 };
 export const dmChangeThreadSubscriptionOperationValidator: TInterface<DMChangeThreadSubscriptionOperation> =
   tShape<DMChangeThreadSubscriptionOperation>({
     type: tString(dmOperationTypes.CHANGE_THREAD_SUBSCRIPTION),
     time: t.Number,
     threadID: t.String,
     creatorID: tUserID,
     subscription: threadSubscriptionValidator,
   });
 
 export type DMChangeThreadReadStatusOperation = {
   +type: 'change_thread_read_status',
   +time: number,
   +threadID: string,
   +creatorID: string,
   +unread: boolean,
 };
 export const dmChangeThreadReadStatusOperationValidator: TInterface<DMChangeThreadReadStatusOperation> =
   tShape<DMChangeThreadReadStatusOperation>({
     type: tString(dmOperationTypes.CHANGE_THREAD_READ_STATUS),
     time: t.Number,
     threadID: t.String,
     creatorID: tUserID,
     unread: t.Boolean,
   });
 
 export type ComposableDMOperation =
   | DMSendTextMessageOperation
   | DMSendMultimediaMessageOperation;
 
 export type DMCreateEntryOperation = {
   +type: 'create_entry',
   +threadID: string,
   +creatorID: string,
   +time: number,
   +entryID: string,
   +entryDate: string,
   +text: string,
   +messageID: string,
 };
 
 export const dmCreateEntryOperationValidator: TInterface<DMCreateEntryOperation> =
   tShape<DMCreateEntryOperation>({
     type: tString(dmOperationTypes.CREATE_ENTRY),
     threadID: t.String,
     creatorID: t.String,
     time: t.Number,
     entryID: t.String,
     entryDate: t.String,
     text: t.String,
     messageID: t.String,
   });
 
 export type DMDeleteEntryOperation = {
   +type: 'delete_entry',
   +threadID: string,
   +creatorID: string,
   +time: number,
   +entryID: string,
   +entryDate: string,
   +text: string,
   +messageID: string,
 };
 
 export const dmDeleteEntryOperationValidator: TInterface<DMDeleteEntryOperation> =
   tShape<DMDeleteEntryOperation>({
     type: tString(dmOperationTypes.DELETE_ENTRY),
     threadID: t.String,
     creatorID: t.String,
     time: t.Number,
     entryID: t.String,
     entryDate: t.String,
     text: t.String,
     messageID: t.String,
   });
 
+export type DMEditEntryOperation = {
+  +type: 'edit_entry',
+  +threadID: string,
+  +creatorID: string,
+  +time: number,
+  +creationTime: number,
+  +entryID: string,
+  +entryDate: string,
+  +text: string,
+  +messageID: string,
+};
+
+export const dmEditEntryOperationValidator: TInterface<DMEditEntryOperation> =
+  tShape<DMEditEntryOperation>({
+    type: tString(dmOperationTypes.EDIT_ENTRY),
+    threadID: t.String,
+    creatorID: t.String,
+    creationTime: t.Number,
+    time: t.Number,
+    entryID: t.String,
+    entryDate: t.String,
+    text: t.String,
+    messageID: t.String,
+  });
+
 export type DMOperation =
   | DMCreateThreadOperation
   | DMCreateSidebarOperation
   | DMSendTextMessageOperation
   | DMSendMultimediaMessageOperation
   | DMSendReactionMessageOperation
   | DMSendEditMessageOperation
   | DMAddMembersOperation
   | DMAddViewerToThreadMembersOperation
   | DMJoinThreadOperation
   | DMLeaveThreadOperation
   | DMRemoveMembersOperation
   | DMChangeThreadSettingsOperation
   | DMChangeThreadSubscriptionOperation
   | DMChangeThreadReadStatusOperation
   | DMCreateEntryOperation
-  | DMDeleteEntryOperation;
+  | DMDeleteEntryOperation
+  | DMEditEntryOperation;
 export const dmOperationValidator: TUnion<DMOperation> = t.union([
   dmCreateThreadOperationValidator,
   dmCreateSidebarOperationValidator,
   dmSendTextMessageOperationValidator,
   dmSendMultimediaMessageOperationValidator,
   dmSendReactionMessageOperationValidator,
   dmSendEditMessageOperationValidator,
   dmAddMembersOperationValidator,
   dmAddViewerToThreadMembersValidator,
   dmJoinThreadOperationValidator,
   dmLeaveThreadOperationValidator,
   dmRemoveMembersOperationValidator,
   dmChangeThreadSettingsOperationValidator,
   dmChangeThreadSubscriptionOperationValidator,
   dmChangeThreadReadStatusOperationValidator,
   dmCreateEntryOperationValidator,
   dmDeleteEntryOperationValidator,
+  dmEditEntryOperationValidator,
 ]);
 
 export type DMOperationResult = {
   rawMessageInfos: Array<RawMessageInfo>,
   updateInfos: Array<ClientUpdateInfo>,
 };
 
 export const processDMOpsActionType = 'PROCESS_DM_OPS';
 
 export type ProcessDMOpsPayload = {
   +rawMessageInfos: $ReadOnlyArray<RawMessageInfo>,
   +updateInfos: $ReadOnlyArray<ClientUpdateInfo>,
   +outboundP2PMessages: ?$ReadOnlyArray<OutboundP2PMessage>,
   // For messages that could be retried from UI, we need to bind DM `messageID`
   // with `outboundP2PMessages` to keep track of whether all P2P messages
   // were queued on Tunnelbroker.
   +composableMessageID: ?string,
   +notificationsCreationData: ?NotificationsCreationData,
 };
 
 export const queueDMOpsActionType = 'QUEUE_DM_OPS';
 export type QueueDMOpsPayload = {
   +operation: DMOperation,
   +threadID: string,
   +timestamp: number,
 };
 
 export const pruneDMOpsQueueActionType = 'PRUNE_DM_OPS_QUEUE';
 export type PruneDMOpsQueuePayload = {
   +pruneMaxTimestamp: number,
 };
 
 export const clearQueuedThreadDMOpsActionType = 'CLEAR_QUEUED_THREAD_DM_OPS';
 export type ClearQueuedThreadDMOpsPayload = {
   +threadID: string,
 };
 
 export type QueuedDMOperations = {
   +operations: {
     +[threadID: string]: $ReadOnlyArray<{
       +operation: DMOperation,
       +timestamp: number,
     }>,
   },
 };