diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
index 1aa6f5ea..68ea4fe9 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
@@ -157,6 +157,7 @@ class ComposeActivity : BaseActivity(),
             if (!tootText.isNullOrEmpty()) {
                 composeEditField.setText(tootText)
             }
+            enableMarkdownMode(composeOptions?.markdownMode ?: false);
         }
 
         if (!TextUtils.isEmpty(composeOptions?.scheduledAt)) {
@@ -1018,7 +1019,8 @@ class ComposeActivity : BaseActivity(),
             var mediaAttachments: List<Attachment>? = null,
             var scheduledAt: String? = null,
             var sensitive: Boolean? = null,
-            var poll: NewPoll? = null
+            var poll: NewPoll? = null,
+            var markdownMode: Boolean? = null
     ) : Parcelable
 
     companion object {