diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
index 48884bac7d..745e5e94c7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
@@ -36,6 +36,7 @@ import org.thoughtcrime.securesms.recipients.RecipientUtil;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
 import org.thoughtcrime.securesms.util.BitmapUtil;
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.Hex;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -226,7 +227,7 @@ public abstract class PushSendJob extends SendJob {
     }
   }
 
-  protected Optional<SignalServiceDataMessage.Quote> getQuoteFor(OutgoingMediaMessage message) {
+  protected Optional<SignalServiceDataMessage.Quote> getQuoteFor(OutgoingMediaMessage message) throws IOException {
     if (message.getOutgoingQuote() == null) return Optional.absent();
 
     long                                                  quoteId             = message.getOutgoingQuote().getId();
@@ -253,13 +254,18 @@ public abstract class PushSendJob extends SendJob {
         }
 
         if (thumbnailData != null) {
-          thumbnail = SignalServiceAttachment.newStreamBuilder()
-                                             .withContentType(thumbnailType)
-                                             .withWidth(thumbnailData.getWidth())
-                                             .withHeight(thumbnailData.getHeight())
-                                             .withLength(thumbnailData.getBitmap().length)
-                                             .withStream(new ByteArrayInputStream(thumbnailData.getBitmap()))
-                                             .build();
+          SignalServiceAttachment.Builder builder = SignalServiceAttachment.newStreamBuilder()
+                                                                           .withContentType(thumbnailType)
+                                                                           .withWidth(thumbnailData.getWidth())
+                                                                           .withHeight(thumbnailData.getHeight())
+                                                                           .withLength(thumbnailData.getBitmap().length)
+                                                                           .withStream(new ByteArrayInputStream(thumbnailData.getBitmap()));
+
+          if (FeatureFlags.attachmentsV3()) {
+            builder.withResumableUploadSpec(ApplicationDependencies.getSignalServiceMessageSender().getResumableUploadSpec());
+          }
+
+          thumbnail = builder.build();
         }
 
         quoteAttachments.add(new SignalServiceDataMessage.Quote.QuotedAttachment(attachment.getContentType(),