diff --git a/src/com/android/email/provider/AttachmentProvider.java b/src/com/android/email/provider/AttachmentProvider.java
index 574656f6d..0d6b225f1 100644
--- a/src/com/android/email/provider/AttachmentProvider.java
+++ b/src/com/android/email/provider/AttachmentProvider.java
@@ -87,7 +87,8 @@ public class AttachmentProvider extends ContentProvider {
          */
         File[] files = getContext().getCacheDir().listFiles();
         for (File file : files) {
-            if (file.getName().endsWith(".tmp")) {
+            String filename = file.getName();
+            if (filename.endsWith(".tmp") || filename.startsWith("thmb_")) {
                 file.delete();
             }
         }