diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 179151c4a..6a9ea5988 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -129,7 +129,7 @@
         </service>
         <provider
             android:name="com.android.email.provider.AttachmentProvider"
-            android:authorities="com.android.email.attachmentprovider"
+            android:authorities="com.fsck.k9.attachmentprovider"
             android:multiprocess="true"
             android:grantUriPermissions="true"
             android:readPermission="com.android.email.permission.READ_ATTACHMENT"
diff --git a/src/com/android/email/provider/AttachmentProvider.java b/src/com/android/email/provider/AttachmentProvider.java
index 95136fa10..cf3d3f1ea 100644
--- a/src/com/android/email/provider/AttachmentProvider.java
+++ b/src/com/android/email/provider/AttachmentProvider.java
@@ -30,7 +30,7 @@ import com.android.email.mail.internet.MimeUtility;
  * A simple ContentProvider that allows file access to Email's attachments.
  */
 public class AttachmentProvider extends ContentProvider {
-    public static final Uri CONTENT_URI = Uri.parse( "content://com.android.email.attachmentprovider");
+    public static final Uri CONTENT_URI = Uri.parse( "content://com.fsck.k9.attachmentprovider");
 
     private static final String FORMAT_RAW = "RAW";
     private static final String FORMAT_THUMBNAIL = "THUMBNAIL";