diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
index a68244cb..5592377e 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
@@ -1019,7 +1019,11 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
     }
 
     protected void setupCard(StatusViewData.Concrete status, CardViewMode cardViewMode) {
-        if (cardViewMode != CardViewMode.NONE && status.getAttachments().size() == 0 && status.getCard() != null && !TextUtils.isEmpty(status.getCard().getUrl())) {
+        if (cardViewMode != CardViewMode.NONE &&
+                status.getAttachments().size() == 0 &&
+                status.getCard() != null &&
+                !TextUtils.isEmpty(status.getCard().getUrl()) &&
+                !status.isCollapsed()) {
             final Card card = status.getCard();
             cardView.setVisibility(View.VISIBLE);
             cardTitle.setText(card.getTitle());
diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index 3048c5db..930e14d3 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -182,7 +182,7 @@
         android:minHeight="80dp"
         android:orientation="vertical"
         app:layout_constraintStart_toStartOf="@id/status_display_name"
-        app:layout_constraintTop_toBottomOf="@+id/status_content"
+        app:layout_constraintTop_toBottomOf="@+id/button_toggle_content"
         app:layout_constraintEnd_toEndOf="parent"
         tools:visibility="gone">
 
@@ -256,7 +256,7 @@
         android:textSize="?attr/status_text_medium"
         android:visibility="gone"
         app:layout_constraintStart_toStartOf="@id/status_display_name"
-        app:layout_constraintTop_toBottomOf="@id/status_card_view"
+        app:layout_constraintTop_toBottomOf="@id/status_content"
         tools:text="@string/status_content_show_less"
         tools:visibility="visible" />