diff --git a/ts/state/ducks/composer.ts b/ts/state/ducks/composer.ts
index afa5cf9341..ba35e53aaa 100644
--- a/ts/state/ducks/composer.ts
+++ b/ts/state/ducks/composer.ts
@@ -1209,7 +1209,6 @@ function saveDraft(
     messageText !== conversation.get('draft') ||
     !isEqual(bodyRanges, conversation.get('draftBodyRanges'))
   ) {
-    log.info(`saveDraft(${conversation.idForLogging()})`);
     const now = Date.now();
     let activeAt = conversation.get('active_at');
     let timestamp = conversation.get('timestamp');
diff --git a/ts/textsecure/MessageReceiver.ts b/ts/textsecure/MessageReceiver.ts
index c037413588..d7881794f9 100644
--- a/ts/textsecure/MessageReceiver.ts
+++ b/ts/textsecure/MessageReceiver.ts
@@ -13,6 +13,7 @@ import type {
   UnidentifiedSenderMessageContent,
 } from '@signalapp/libsignal-client';
 import {
+  ContentHint,
   CiphertextMessageType,
   DecryptionErrorMessage,
   groupDecrypt,
@@ -1890,6 +1891,9 @@ export default class MessageReceiver
       const uuid = envelope.sourceUuid;
       const deviceId = envelope.sourceDevice;
 
+      const ourUuid = this.storage.user.getCheckedUuid().toString();
+      const isFromMe = ourUuid === uuid;
+
       // Job timed out, not a decryption error
       if (
         error?.name === 'TimeoutError' ||
@@ -1931,7 +1935,9 @@ export default class MessageReceiver
           {
             cipherTextBytes,
             cipherTextType,
-            contentHint: envelope.contentHint,
+            contentHint:
+              envelope.contentHint ??
+              (isFromMe ? ContentHint.Resendable : undefined),
             groupId: envelope.groupId,
             receivedAtCounter: envelope.receivedAtCounter,
             receivedAtDate: envelope.receivedAtDate,