diff --git a/app/build.gradle b/app/build.gradle
index 1c3454d54..723509a4d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "fr.gouv.etalab.mastodon"
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 116
-        versionName "1.8.4"
+        versionCode 117
+        versionName "1.8.5"
     }
     flavorDimensions "default"
     buildTypes {
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 9e4825921..f88811d7a 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
@@ -816,7 +816,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                     if (!status.getReblog().isSensitive() && (behaviorWithAttachments == Helper.ATTACHMENT_ALWAYS || (behaviorWithAttachments == Helper.ATTACHMENT_WIFI && isOnWifi))) {
                         loadAttachments(status.getReblog(), holder);
                         holder.status_show_more.setVisibility(View.GONE);
-                        status.getReblog().setAttachmentShown(true);
+                        status.setAttachmentShown(true);
                     } else {
                         //Text depending if toots is sensitive or not
                         String textShowMore = (status.getReblog().isSensitive()) ? context.getString(R.string.load_sensitive_attachment) : context.getString(R.string.load_attachment);
@@ -839,6 +839,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                         status.getReblog().setSensitive(true);
                     else
                         status.setSensitive(true);
+
                     if( theme == Helper.THEME_DARK)
                         changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_text);
                     else