diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java
index a52359cd98..c4fbf5429c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java
@@ -94,7 +94,7 @@ public class AttachmentUtil {
       MessageRecord message = SignalDatabase.messages().getMessageRecord(attachment.getMmsId());
 
       Recipient fromRecipient = message.getFromRecipient();
-      Recipient toRecipient   = message.getToRecipient();
+      Recipient toRecipient   = SignalDatabase.threads().getRecipientForThreadId(message.getThreadId());
 
       if (toRecipient != null && toRecipient.isGroup()) {
         return toRecipient.isProfileSharing() || isTrustedIndividual(fromRecipient, message);