diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
index 437e988e20..8b834b701e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java
@@ -283,15 +283,30 @@ public class MediaUtil {
   }
 
   public static boolean isImageType(String contentType) {
-    return (null != contentType) && contentType.startsWith("image/");
+    if (contentType == null) {
+      return false;
+    }
+
+    return contentType.startsWith("image/") ||
+           contentType.equals(MediaStore.Images.Media.CONTENT_TYPE);
   }
 
   public static boolean isAudioType(String contentType) {
-    return (null != contentType) && contentType.startsWith("audio/");
+    if (contentType == null) {
+      return false;
+    }
+
+    return contentType.startsWith("audio/") ||
+           contentType.equals(MediaStore.Audio.Media.CONTENT_TYPE);
   }
 
   public static boolean isVideoType(String contentType) {
-    return (null != contentType) && contentType.startsWith("video/");
+    if (contentType == null) {
+      return false;
+    }
+
+    return contentType.startsWith("video/") ||
+           contentType.equals(MediaStore.Video.Media.CONTENT_TYPE);
   }
 
   public static boolean isImageOrVideoType(String contentType) {