diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index 79a22977..0db8a020 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -91,8 +91,8 @@ dependencies {
 	appcenterPublicBetaImplementation "com.microsoft.appcenter:appcenter-crashes:${appCenterSdkVersion}"
 	appcenterPublicBetaImplementation "com.microsoft.appcenter:appcenter-distribute:${appCenterSdkVersion}"
 
-	androidTestImplementation 'androidx.test:core:1.4.1-alpha05'
-	androidTestImplementation 'androidx.test.ext:junit:1.1.4-alpha05'
-	androidTestImplementation 'androidx.test:runner:1.5.0-alpha02'
-	androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0-alpha05'
+	androidTestImplementation 'androidx.test:core:1.5.0'
+	androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+	androidTestImplementation 'androidx.test:runner:1.5.2'
+	androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java
index 29ef9f56..32f14a33 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeMediaViewController.java
@@ -287,6 +287,7 @@ public class ComposeMediaViewController{
 		DraftMediaAttachment draft=new DraftMediaAttachment();
 		draft.uri=uri;
 		draft.description=description;
+		draft.mimeType="image/jpeg";
 		attachmentsView.addView(createMediaAttachmentView(draft));
 		attachments.add(draft);
 		attachmentsScroller.setVisibility(View.VISIBLE);