diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index f2713abb9..b2c1e0d53 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -1220,6 +1220,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 }
             }else {
                 holder.status_cardview.setVisibility(View.GONE);
+                holder.status_cardview_video.setVisibility(View.GONE);
             }
 
             holder.status_reply.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index b989328ab..d02505597 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -2032,7 +2032,12 @@ public class Helper {
      */
     public static ArrayList<Attachment> restoreAttachmentFromString(String serializedAttachment){
         Type listType = new TypeToken<ArrayList<Attachment>>(){}.getType();
-        return new Gson().fromJson(serializedAttachment, listType);
+        try {
+            return new Gson().fromJson(serializedAttachment, listType);
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
     }
 
 
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 867130a14..7239755e4 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -283,6 +283,7 @@
 
                 <LinearLayout
                     android:id="@+id/status_cardview"
+                    android:visibility="gone"
                     android:layout_marginBottom="5dp"
                     android:background="@drawable/card_border"
                     android:layout_width="match_parent"