diff --git a/res/layout/link_preview.xml b/res/layout/link_preview.xml
index 493f65a41f..c4215b810a 100644
--- a/res/layout/link_preview.xml
+++ b/res/layout/link_preview.xml
@@ -79,11 +79,11 @@
             android:layout_marginEnd="6dp"
             android:layout_marginTop="4dp"
             android:src="@drawable/ic_close_white_18dp"
-            android:visibility="visible"
+            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:tint="@color/gray70"
-            tools:ignore="MissingPrefix" />
+            tools:visibility="visible" />
 
         <com.github.ybq.android.spinkit.SpinKitView
             style="@style/SpinKitView.DoubleBounce"
diff --git a/src/org/thoughtcrime/securesms/components/LinkPreviewView.java b/src/org/thoughtcrime/securesms/components/LinkPreviewView.java
index 6453b0cbf9..48bf982f30 100644
--- a/src/org/thoughtcrime/securesms/components/LinkPreviewView.java
+++ b/src/org/thoughtcrime/securesms/components/LinkPreviewView.java
@@ -100,6 +100,16 @@ public class LinkPreviewView extends FrameLayout {
     site.setVisibility(GONE);
     thumbnail.setVisibility(GONE);
     spinner.setVisibility(VISIBLE);
+    closeButton.setVisibility(GONE);
+  }
+
+  public void setLinkPreview(@NonNull GlideRequests glideRequests, @NonNull LinkPreview linkPreview, boolean showThumbnail, boolean showCloseButton) {
+    setLinkPreview(glideRequests, linkPreview, showThumbnail);
+    if (showCloseButton) {
+      closeButton.setVisibility(VISIBLE);
+    } else {
+      closeButton.setVisibility(GONE);
+    }
   }
 
   public void setLinkPreview(@NonNull GlideRequests glideRequests, @NonNull LinkPreview linkPreview, boolean showThumbnail) {
@@ -107,6 +117,7 @@ public class LinkPreviewView extends FrameLayout {
     site.setVisibility(VISIBLE);
     thumbnail.setVisibility(VISIBLE);
     spinner.setVisibility(GONE);
+    closeButton.setVisibility(VISIBLE);
 
     title.setText(linkPreview.getTitle());
 
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
index 612d9d3455..e60d7e4df1 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -583,7 +583,7 @@ public class ConversationItem extends TapJackingProofLinearLayout
         mediaThumbnailStub.get().setDownloadClickListener(downloadClickListener);
         mediaThumbnailStub.get().setOnLongClickListener(passthroughClickListener);
 
-        linkPreviewStub.get().setLinkPreview(glideRequests, linkPreview, false);
+        linkPreviewStub.get().setLinkPreview(glideRequests, linkPreview, false, false);
 
         setThumbnailCorners(messageRecord, previousRecord, nextRecord, isGroupThread);
         setLinkPreviewCorners(messageRecord, previousRecord, nextRecord, isGroupThread, true);
@@ -591,7 +591,7 @@ public class ConversationItem extends TapJackingProofLinearLayout
         ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         ViewUtil.updateLayoutParams(groupSenderHolder, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       } else {
-        linkPreviewStub.get().setLinkPreview(glideRequests, linkPreview, true);
+        linkPreviewStub.get().setLinkPreview(glideRequests, linkPreview, true, false);
         linkPreviewStub.get().setDownloadClickedListener(downloadClickListener);
         setLinkPreviewCorners(messageRecord, previousRecord, nextRecord, isGroupThread, false);
         ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -601,7 +601,6 @@ public class ConversationItem extends TapJackingProofLinearLayout
       linkPreviewStub.get().setOnClickListener(linkPreviewClickListener);
       linkPreviewStub.get().setOnLongClickListener(passthroughClickListener);
 
-
       footer.setVisibility(VISIBLE);
     } else if (hasAudio(messageRecord)) {
       audioViewStub.get().setVisibility(View.VISIBLE);