diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index abab4c7cf..e65c9bba7 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -65,6 +65,7 @@ import com.twitter.twittertext.TwitterTextEmojiRegex;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.TweakedFileProvider;
 import org.joinmastodon.android.api.MastodonErrorResponse;
 import org.joinmastodon.android.api.requests.statuses.CreateStatus;
 import org.joinmastodon.android.api.requests.statuses.DeleteStatus;
@@ -98,7 +99,6 @@ import org.joinmastodon.android.ui.text.ComposeAutocompleteSpan;
 import org.joinmastodon.android.ui.text.ComposeHashtagOrMentionSpan;
 import org.joinmastodon.android.ui.text.HtmlParser;
 import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
-import org.joinmastodon.android.utils.FileProvider;
 import org.joinmastodon.android.utils.TransferSpeedTracker;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.viewcontrollers.ComposeAutocompleteViewController;
@@ -1505,7 +1505,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	private void openCamera() throws IOException {
 		if (getContext().checkSelfPermission(Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
 			File photoFile = File.createTempFile("img", ".jpg");
-			photoUri = FileProvider.getUriForFile(getContext(), getContext().getPackageName() + ".fileprovider", photoFile);
+			photoUri = UiUtils.getFileProviderUri(getContext(), photoFile);
 
 			Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
 			cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoUri);
diff --git a/mastodon/src/main/res/xml/file_paths.xml b/mastodon/src/main/res/xml/file_paths.xml
deleted file mode 100644
index 1a6beb42f..000000000
--- a/mastodon/src/main/res/xml/file_paths.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
-    <external-path name="external_files" path="." />
-    <cache-path
-        name="cache"
-        path="."/>
-</paths>
\ No newline at end of file
diff --git a/mastodon/src/main/res/xml/fileprovider_paths.xml b/mastodon/src/main/res/xml/fileprovider_paths.xml
index c1701d9f4..9c947d494 100644
--- a/mastodon/src/main/res/xml/fileprovider_paths.xml
+++ b/mastodon/src/main/res/xml/fileprovider_paths.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths>
 	<cache-path name="image_cache" path="images/"/>
+	<cache-path
+		name="pictures_taken_through_compose"
+		path="."/>
 </paths>
\ No newline at end of file