diff --git a/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Poll.java b/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Poll.java
index e9270f062..87269a59a 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Poll.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Poll.java
@@ -61,7 +61,7 @@ public class Poll implements Serializable {
         public transient Spannable span_title;
 
         public Spannable getSpanTitle(Context context, Status status, WeakReference<View> viewWeakReference) {
-            span_title = SpannableHelper.convert(context, title, status, null, null, viewWeakReference, null, false);
+            span_title = SpannableHelper.convert(context, title, status, null, null, viewWeakReference, null, false, false);
             return span_title;
         }
     }
diff --git a/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Status.java b/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Status.java
index 15fec66bb..062ee42c2 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Status.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Status.java
@@ -152,21 +152,21 @@ public class Status implements Serializable, Cloneable {
 
     public synchronized Spannable getSpanContent(Context context, WeakReference<View> viewWeakReference, Callback callback) {
         if (contentSpan == null) {
-            contentSpan = SpannableHelper.convert(context, content, this, null, null, viewWeakReference, callback);
+            contentSpan = SpannableHelper.convert(context, content, this, null, null, viewWeakReference, callback, true);
         }
         return contentSpan;
     }
 
     public synchronized Spannable getSpanSpoiler(Context context, WeakReference<View> viewWeakReference, Callback callback) {
         if (contentSpoilerSpan == null) {
-            contentSpoilerSpan = SpannableHelper.convert(context, spoiler_text, this, null, null, viewWeakReference, callback);
+            contentSpoilerSpan = SpannableHelper.convert(context, spoiler_text, this, null, null, viewWeakReference, callback, false);
         }
         return contentSpoilerSpan;
     }
 
     public synchronized Spannable getSpanTranslate(Context context, WeakReference<View> viewWeakReference, Callback callback) {
         if (contentTranslateSpan == null) {
-            contentTranslateSpan = SpannableHelper.convert(context, translationContent, this, null, null, viewWeakReference, callback);
+            contentTranslateSpan = SpannableHelper.convert(context, translationContent, this, null, null, viewWeakReference, callback, true);
         }
         return contentTranslateSpan;
     }
diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java
index 4cbfa8c83..d6c4ee815 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java
@@ -108,13 +108,13 @@ public class SpannableHelper {
 
     public static Spannable convert(Context context, String text,
                                     Status status, Account account, Announcement announcement, WeakReference<View> viewWeakReference) {
-        return convert(context, text, status, account, announcement, viewWeakReference, null, true);
+        return convert(context, text, status, account, announcement, viewWeakReference, null, true, false);
     }
 
     public static Spannable convert(Context context, String text,
                                     Status status, Account account, Announcement announcement,
-                                    WeakReference<View> viewWeakReference, Status.Callback callback) {
-        return convert(context, text, status, account, announcement, viewWeakReference, callback, true);
+                                    WeakReference<View> viewWeakReference, Status.Callback callback, boolean convertMarkdown) {
+        return convert(context, text, status, account, announcement, viewWeakReference, callback, true, convertMarkdown);
     }
 
 
@@ -135,7 +135,7 @@ public class SpannableHelper {
 
     public static Spannable convert(Context context, String text,
                                     Status status, Account account, Announcement announcement,
-                                    WeakReference<View> viewWeakReference, Status.Callback callback, boolean convertHtml) {
+                                    WeakReference<View> viewWeakReference, Status.Callback callback, boolean convertHtml, boolean convertMarkdown) {
         if (text == null) {
             return null;
         }
@@ -179,7 +179,7 @@ public class SpannableHelper {
         boolean markdownSupport = sharedpreferences.getBoolean(context.getString(R.string.SET_MARKDOWN_SUPPORT), true);
         //Get all links
         SpannableStringBuilder content;
-        if (markdownSupport) {
+        if (markdownSupport && convertMarkdown) {
             MarkdownConverter markdownConverter = new MarkdownConverter();
             markdownConverter.markdownItems = new ArrayList<>();
             int next;