diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index 132cf2919..3dcb0d8d9 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -550,9 +550,9 @@ public class ConversationItem extends LinearLayout
 
     ConversationItemFooter activeFooter = getActiveFooter(current);
     if (documentViewStub.resolved()) {
-        if (documentViewStub.get().hasAnimation()) {
+	if (documentViewStub.get().getComposedAnimation() != null) {
             activeFooter.setBackgroundResource(R.drawable.conversation_item_update_background);
-            activeFooter.setTextColor(Color.parseColor("#ffffffff"));
+            activeFooter.setTextColor(Color.parseColor("#FFFFFF"));
             activeFooter.setPadding(8,4,8,4);
         }
     }
diff --git a/src/org/thoughtcrime/securesms/components/DocumentView.java b/src/org/thoughtcrime/securesms/components/DocumentView.java
index 00c41eaa6..a9b7241cb 100644
--- a/src/org/thoughtcrime/securesms/components/DocumentView.java
+++ b/src/org/thoughtcrime/securesms/components/DocumentView.java
@@ -13,7 +13,9 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import com.airbnb.lottie.LottieAnimationView;
-import com.google.gson.JsonParser;
+import com.airbnb.lottie.LottieComposition;
+import com.airbnb.lottie.LottieCompositionFactory;
+import com.airbnb.lottie.LottieResult;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.mms.DocumentSlide;
@@ -22,7 +24,6 @@ import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.guava.Optional;
 
-import java.io.InputStreamReader;
 import java.util.zip.GZIPInputStream;
 
 public class DocumentView extends FrameLayout {
@@ -63,20 +64,19 @@ public class DocumentView extends FrameLayout {
   {
       this.documentSlide = documentSlide;
 
-      if (hasAnimation()) {
+      LottieComposition composedAnimation = getComposedAnimation();
+      if (composedAnimation != null) {
 	  container.setVisibility(GONE);
 	  lottie.setVisibility(VISIBLE);
+	  lottie.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+	  lottie.setScale(0.3f);
 	  lottie.setOnFocusChangeListener((v, hasFocus) -> {
 		  if (v instanceof LottieAnimationView) {
 		      ((LottieAnimationView) v).resumeAnimation();
 		  }
 	      });
 	  ViewUtil.updateLayoutParams(lottie, ViewGroup.LayoutParams.WRAP_CONTENT, 300);
-	  try {
-	      lottie.setAnimation(new GZIPInputStream(getContext().getContentResolver().openInputStream(documentSlide.getUri())), null);
-	  } catch (Exception e) {
-	      e.printStackTrace();
-	  }
+	  lottie.setComposition(composedAnimation);
 	  lottie.setOnClickListener(v -> {
 		  if (v instanceof LottieAnimationView) {
 		      if (((LottieAnimationView) v).isAnimating()) {
@@ -103,17 +103,20 @@ public class DocumentView extends FrameLayout {
       }
   }
 
-  public boolean hasAnimation() {
-    boolean animated = false;
+  public LottieComposition getComposedAnimation() {
     if(documentSlide.hasAnimation()){
       try {
-        new JsonParser().parse(new InputStreamReader(new GZIPInputStream( getContext().getContentResolver().openInputStream(documentSlide.getUri())))).isJsonArray();
-        animated = true;
+	  LottieResult<LottieComposition> composed = LottieCompositionFactory.fromJsonInputStreamSync(new GZIPInputStream(getContext().getContentResolver().openInputStream(documentSlide.getUri())), documentSlide.getUri().toString());
+	  if (composed.getValue() != null) {
+	      if (composed.getValue() instanceof LottieComposition) {
+		  return composed.getValue();
+	      }
+	  }
       } catch (Exception e) {
-        e.printStackTrace();
+	  e.printStackTrace();
       }
     }
-    return animated;
+    return null;
   }
 
   @Override