diff --git a/src/com/fsck/k9/provider/AttachmentProvider.java b/src/com/fsck/k9/provider/AttachmentProvider.java
index 04fa3adc0..2374b7e3f 100644
--- a/src/com/fsck/k9/provider/AttachmentProvider.java
+++ b/src/com/fsck/k9/provider/AttachmentProvider.java
@@ -65,18 +65,7 @@ public class AttachmentProvider extends ContentProvider
     @Override
     public boolean onCreate()
     {
-        /*
-         * We use the cache dir as a temporary directory (since Android doesn't give us one) so
-         * on startup we'll clean up any .tmp files from the last run.
-         */
-        File[] files = getContext().getCacheDir().listFiles();
-        for (File file : files)
-        {
-            if (file.getName().endsWith(".tmp"))
-            {
-                file.delete();
-            }
-        }
+        clear(getContext());
         return true;
     }