diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentController.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentController.java
index a5d6ca146..7c077958e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentController.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentController.java
@@ -32,6 +32,7 @@ import static android.support.media.ExifInterface.TAG_IMAGE_WIDTH;
 import static android.support.media.ExifInterface.TAG_ORIENTATION;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.util.IoUtils.tryToClose;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.LogUtils.now;
@@ -122,11 +123,7 @@ class AttachmentController {
 		} catch (IOException e) {
 			logException(LOG, WARNING, e);
 		} finally {
-			try {
-				is.close();
-			} catch (IOException e) {
-				logException(LOG, WARNING, e);
-			}
+			tryToClose(is, LOG, WARNING);
 		}
 
 		// calculate thumbnail size
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java
index 51d51434d..c70abd24e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java
@@ -13,7 +13,6 @@ import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.android.conversation.AttachmentItem;
 import org.briarproject.briar.api.messaging.MessagingManager;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
@@ -23,7 +22,7 @@ import javax.inject.Inject;
 import static com.bumptech.glide.load.DataSource.LOCAL;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.LogUtils.logException;
+import static org.briarproject.bramble.util.IoUtils.tryToClose;
 
 @NotNullByDefault
 class BriarDataFetcher implements DataFetcher<InputStream> {
@@ -65,14 +64,7 @@ class BriarDataFetcher implements DataFetcher<InputStream> {
 
 	@Override
 	public void cleanup() {
-		final InputStream stream = inputStream;
-		if (stream != null) {
-			try {
-				stream.close();
-			} catch (IOException e) {
-				logException(LOG, WARNING, e);
-			}
-		}
+		tryToClose(inputStream, LOG, WARNING);
 	}
 
 	@Override