diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java
index ba4bfec9c..d6ba5b7ee 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java
@@ -77,6 +77,7 @@ public class ImageFragment extends Fragment {
 				viewModelFactory).get(ImageViewModel.class);
 
 		photoView = v.findViewById(R.id.photoView);
+		photoView.setScaleLevels(1, 2, 4);
 		photoView.setOnClickListener(view -> viewModel.clickImage());
 
 		// Request Listener
@@ -113,6 +114,8 @@ public class ImageFragment extends Fragment {
 		// Load Image
 		GlideApp.with(this)
 				.load(attachment)
+				// TODO allow if < maxTextureSize ?
+//				.override(SIZE_ORIGINAL)
 				.diskCacheStrategy(NONE)
 				.error(R.drawable.ic_image_broken)
 				.dontTransform()