diff --git a/app/build.gradle b/app/build.gradle
index 991cfd1bb..4b7a6f126 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 28
-        versionCode 287
-        versionName "2.8.0"
+        versionCode 288
+        versionName "2.8.1"
         multiDexEnabled true
         renderscriptTargetApi 28 as int
         renderscriptSupportModeEnabled true
diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
index 7133c2daa..2356226e9 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -2317,7 +2317,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 holder.status_pin.setVisibility(View.GONE);
             }
 
-            if( (isAdmin || isModerator) && !isCompactMode && !isConsoleMode && getItemViewType(viewHolder.getAdapterPosition()) != FOCUSED_STATUS){
+            if( (isAdmin || isModerator) && !isCompactMode && !isConsoleMode && getItemViewType(viewHolder.getAdapterPosition()) != FOCUSED_STATUS && type != RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE){
                 holder.status_remove.setVisibility(View.VISIBLE);
             }else {
                 holder.status_remove.setVisibility(View.GONE);
@@ -2359,12 +2359,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
 
             holder.quick_reply_privacy.setOnClickListener(view -> {
 
-                if( context instanceof BaseMainActivity){
-                    FloatingActionButton toot = ((BaseMainActivity) context).findViewById(R.id.toot);
-                    if( toot != null){
-                        toot.hide();
-                    }
-                }
                 int style;
                 if (theme == Helper.THEME_DARK) {
                     style = R.style.DialogDark;
@@ -2502,6 +2496,12 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
 
                     if (quick_reply && type != RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE) {
 
+                        if( context instanceof BaseMainActivity){
+                            FloatingActionButton toot = ((BaseMainActivity) context).findViewById(R.id.toot);
+                            if( toot != null){
+                                toot.hide();
+                            }
+                        }
                         holder.warning_message.setVisibility(View.GONE);
                         if( status.getWarningFetched() == -1 ){
                             warning_message = holder.warning_message;
diff --git a/fastlane/metadata/android/en-US/changelogs/288.txt b/fastlane/metadata/android/en-US/changelogs/288.txt
new file mode 100644
index 000000000..c1e8d1bf2
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/288.txt
@@ -0,0 +1,8 @@
+<b>Added</b>
+- Moderation feature for Pleroma
+
+<b>Changed</b>
+- Add media with polls with Pleroma
+
+<b>Fixed</b>
+- Behavior of the compose button when scrolling
\ No newline at end of file