diff --git a/src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java b/src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java
index 931b7d3f68..9707f423d9 100644
--- a/src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java
+++ b/src/org/thoughtcrime/securesms/providers/PersistentBlobProvider.java
@@ -151,9 +151,21 @@ public class PersistentBlobProvider {
   }
 
   private File getFile(long id) {
+    File legacy = getLegacyFile(id);
+    File cache  = getCacheFile(id);
+
+    if (legacy.exists()) return legacy;
+    else                 return cache;
+  }
+
+  private File getLegacyFile(long id) {
     return new File(context.getDir("captures", Context.MODE_PRIVATE), id + "." + BLOB_EXTENSION);
   }
 
+  private File getCacheFile(long id) {
+    return new File(context.getCacheDir(), "capture-" + id + "." + BLOB_EXTENSION);
+  }
+
   private @Nullable String getEncryptedFileName(@NonNull MasterSecret masterSecret, @Nullable String fileName) {
     if (fileName == null) return null;
     return new MasterCipher(masterSecret).encryptBody(fileName);