diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
index ff811dd00..8da43903c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
@@ -43,6 +43,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 	private CharSequence text;
 	private CustomEmojiHelper emojiHelper=new CustomEmojiHelper(), spoilerEmojiHelper;
 	private CharSequence parsedSpoilerText;
+	private boolean showFiltered = false;
 	public boolean textSelectable;
 	public final Status status;
 	public boolean translated = false;
@@ -119,9 +120,6 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			text.setText(item.translated
 							? HtmlParser.parse(item.translation.content, item.status.emojis, item.status.mentions, item.status.tags, item.parentFragment.getAccountID())
 							: item.text);
-			if(item.status.filtered.size() > 0){
-				text.setText("Filtered");
-			}
 			text.setTextIsSelectable(item.textSelectable);
 			spoilerTitleInline.setTextIsSelectable(item.textSelectable);
 			text.setInvalidateOnEveryFrame(false);
@@ -129,27 +127,82 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			spoilerTitleInline.setPadding(spoilerTitleInline.getPaddingLeft(), item.inset ? 0 : V.dp(14), spoilerTitleInline.getPaddingRight(), item.inset ? 0 : V.dp(14));
 			borderTop.setBackground(item.inset ? null : borderColor);
 			borderBottom.setBackground(item.inset ? null : borderColor);
-			if(!TextUtils.isEmpty(item.status.spoilerText)){
-				spoilerTitle.setText(item.parsedSpoilerText);
-				spoilerTitleInline.setText(item.parsedSpoilerText);
-				if(item.status.spoilerRevealed){
-					spoilerOverlay.setVisibility(View.GONE);
-					spoilerHeader.setVisibility(View.VISIBLE);
-					textWrap.setVisibility(View.VISIBLE);
-					itemView.setClickable(false);
-				}else{
+
+//			if(!TextUtils.isEmpty(item.status.spoilerText)){
+//				spoilerTitle.setText(item.parsedSpoilerText);
+//				spoilerTitleInline.setText(item.parsedSpoilerText);
+//				if(item.status.spoilerRevealed){
+//					spoilerOverlay.setVisibility(View.GONE);
+//					spoilerHeader.setVisibility(View.VISIBLE);
+//					textWrap.setVisibility(View.VISIBLE);
+//					itemView.setClickable(false);
+//				}else{
+//					spoilerOverlay.setVisibility(View.VISIBLE);
+//					spoilerHeader.setVisibility(View.GONE);
+//					textWrap.setVisibility(View.GONE);
+//					itemView.setClickable(true);
+//				}
+//			}else{
+//				spoilerOverlay.setVisibility(View.GONE);
+//				spoilerHeader.setVisibility(View.GONE);
+//				textWrap.setVisibility(View.VISIBLE);
+//				itemView.setClickable(false);
+//			}
+
+			if(!item.showFiltered){
+				if(item.status.filtered.size() > 0){
+					spoilerTitle.setText("Filtered");
+					spoilerTitleInline.setText(item.parsedSpoilerText);
+//				if(item.status.spoilerRevealed){
+//					spoilerOverlay.setVisibility(View.GONE);
+//					spoilerHeader.setVisibility(View.VISIBLE);
+//					textWrap.setVisibility(View.VISIBLE);
+//					itemView.setClickable(false);
+//				}else{
 					spoilerOverlay.setVisibility(View.VISIBLE);
 					spoilerHeader.setVisibility(View.GONE);
 					textWrap.setVisibility(View.GONE);
 					itemView.setClickable(true);
 				}
 			}else{
-				spoilerOverlay.setVisibility(View.GONE);
-				spoilerHeader.setVisibility(View.GONE);
-				textWrap.setVisibility(View.VISIBLE);
-				itemView.setClickable(false);
+				if(!TextUtils.isEmpty(item.status.spoilerText)){
+					spoilerTitle.setText(item.parsedSpoilerText);
+					spoilerTitleInline.setText(item.parsedSpoilerText);
+					if(item.status.spoilerRevealed){
+						spoilerOverlay.setVisibility(View.GONE);
+						spoilerHeader.setVisibility(View.VISIBLE);
+						textWrap.setVisibility(View.VISIBLE);
+						itemView.setClickable(false);
+					}else{
+						spoilerOverlay.setVisibility(View.VISIBLE);
+						spoilerHeader.setVisibility(View.GONE);
+						textWrap.setVisibility(View.GONE);
+						itemView.setClickable(true);
+					}
+				}else{
+					spoilerOverlay.setVisibility(View.GONE);
+					spoilerHeader.setVisibility(View.GONE);
+					textWrap.setVisibility(View.VISIBLE);
+					itemView.setClickable(false);
+				}
 			}
 
+//			else{
+//				spoilerOverlay.setVisibility(View.GONE);
+//				spoilerHeader.setVisibility(View.GONE);
+//				textWrap.setVisibility(View.VISIBLE);
+//				itemView.setClickable(false);
+//			}
+
+
+//			if(item.status.filtered.size() > 0){
+////				text.setText("Filtered");
+//				spoilerOverlay.setVisibility(View.VISIBLE);
+//				spoilerHeader.setVisibility(View.VISIBLE);
+//				textWrap.setVisibility(View.GONE);
+//				itemView.setClickable(false);
+//			}
+
 			Instance instanceInfo = AccountSessionManager.getInstance().getInstanceInfo(item.session.domain);
 			boolean translateEnabled = instanceInfo.v2 != null && instanceInfo.v2.configuration.translation != null && instanceInfo.v2.configuration.translation.enabled;