diff --git a/app/core/src/main/java/com/fsck/k9/provider/AppContentProvider.java b/app/core/src/main/java/com/fsck/k9/provider/AppContentProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..aa82997c239fff3bf9bd05d1f260abcab65536cc
--- /dev/null
+++ b/app/core/src/main/java/com/fsck/k9/provider/AppContentProvider.java
@@ -0,0 +1,47 @@
+package com.fsck.k9.provider;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public class AppContentProvider extends ContentProvider {
+
+    @Nullable
+    @Override
+    public String getType(@NonNull Uri uri) {
+        return null;
+    }
+
+    @Override
+    public int update(@NonNull Uri uri, @Nullable ContentValues contentValues, @Nullable String s,
+            @Nullable String[] strings) {
+        return 0;
+    }
+
+    @Nullable
+    @Override
+    public Uri insert(@NonNull Uri uri, @Nullable ContentValues contentValues) {
+        return null;
+    }
+
+    @Override
+    public boolean onCreate() {
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public Cursor query(@NonNull Uri uri, @Nullable String[] strings, @Nullable String s, @Nullable String[] strings1,
+            @Nullable String s1) {
+        return null;
+    }
+
+    @Override
+    public int delete(@NonNull Uri uri, @Nullable String s, @Nullable String[] strings) {
+        return 0;
+    }
+}
diff --git a/app/k9mail/src/main/AndroidManifest.xml b/app/k9mail/src/main/AndroidManifest.xml
index b9947fc98741e926a6e80cdbd427f8b8b10b85a0..494ee2619ebc3b09d36825b45a769d3e48848139 100644
--- a/app/k9mail/src/main/AndroidManifest.xml
+++ b/app/k9mail/src/main/AndroidManifest.xml
@@ -426,5 +426,11 @@
                 android:resource="@xml/temp_file_provider_paths" />
         </provider>
 
+        <provider
+            android:name=".provider.AppContentProvider"
+            android:authorities="foundation.e.mail.provider.AppContentProvider"
+            android:enabled="true"
+            android:exported="true" />
+
     </application>
 </manifest>