diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsRepository.java b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsRepository.java
index 32717256c3..f8dde73be7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsRepository.java
@@ -15,6 +15,7 @@ import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.database.DatabaseObserver;
 import org.thoughtcrime.securesms.database.GroupReceiptTable;
 import org.thoughtcrime.securesms.database.GroupTable;
+import org.thoughtcrime.securesms.database.MessageTable;
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
@@ -60,7 +61,7 @@ public final class MessageDetailsRepository {
     return Observable.<MessageDetails>create(emitter -> {
       DatabaseObserver.MessageObserver messageObserver = mId -> {
         try {
-          MessageRecord  messageRecord  = SignalDatabase.messages().getMessageRecord(messageId.getId());
+          MessageRecord  messageRecord  = MessageTable.withAttachmentData(SignalDatabase.messages().getMessageRecord(messageId.getId()));
           MessageDetails messageDetails = getRecipientDeliveryStatusesInternal(messageRecord);
 
           emitter.onNext(messageDetails);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageRecordLiveData.java b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageRecordLiveData.java
index c279b4ee23..c51f4997c7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageRecordLiveData.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageRecordLiveData.java
@@ -5,6 +5,7 @@ import androidx.lifecycle.LiveData;
 
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.database.DatabaseObserver;
+import org.thoughtcrime.securesms.database.MessageTable;
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MessageId;
@@ -34,7 +35,7 @@ final class MessageRecordLiveData extends LiveData<MessageRecord> {
   @WorkerThread
   private synchronized void retrieveMessageRecordActual() {
     try {
-      MessageRecord record = SignalDatabase.messages().getMessageRecord(messageId.getId());
+      MessageRecord record = MessageTable.withAttachmentData(SignalDatabase.messages().getMessageRecord(messageId.getId()));
 
       if (record.isPaymentNotification()) {
         record = SignalDatabase.payments().updateMessageWithPayment(record);