diff --git a/FEATURES.md b/FEATURES.md
index 13d062719c..3c35860e32 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -37,7 +37,7 @@ Note that following list of changes compared to Element X is likely incomplete,
 
 - Allow sending freeform reactions
 - Don't waste horizontal space in message bubbles with forced line-breaks that do not make full use of the available width
-- Render inline images such as custom emotes in text messages
+- Render inline images such as custom emotes in text messages †
 
 - Disable Element's pinned message overlay on top of the conversation screen †
 - Access pinned messages via toolbar action when the pinned message overlay is disabled †
diff --git a/schildi/lib/src/main/kotlin/chat/schildi/lib/preferences/ScPrefs.kt b/schildi/lib/src/main/kotlin/chat/schildi/lib/preferences/ScPrefs.kt
index 0bf29bcb6c..692ad435ec 100644
--- a/schildi/lib/src/main/kotlin/chat/schildi/lib/preferences/ScPrefs.kt
+++ b/schildi/lib/src/main/kotlin/chat/schildi/lib/preferences/ScPrefs.kt
@@ -80,7 +80,7 @@ object ScPrefs {
     val PREFER_FREEFORM_REACTIONS = ScBoolPref("PREFER_FREEFORM_REACTIONS", false, R.string.sc_pref_prefer_freeform_reactions_title, R.string.sc_pref_prefer_freeform_reactions_summary, authorsChoice = false)
     val PREFER_FULLSCREEN_REACTION_SHEET = ScBoolPref("PREFER_FULLSCREEN_REACTION_SHEET", false, R.string.sc_pref_prefer_fullscreen_reaction_sheet_title, R.string.sc_pref_prefer_fullscreen_reaction_sheet_summary, authorsChoice = false, upstreamChoice = false)
     val JUMP_TO_UNREAD = ScBoolPref("JUMP_TO_UNREAD", false, R.string.sc_pref_jump_to_unread_title, R.string.sc_pref_jump_to_unread_option_summary, authorsChoice = true, upstreamChoice = false)
-    val RENDER_INLINE_IMAGES = ScBoolPref("RENDER_INLINE_IMAGES", false, R.string.sc_pref_render_inline_images_title, R.string.sc_pref_render_inline_images_summary, authorsChoice = true, upstreamChoice = false)
+    val RENDER_INLINE_IMAGES = ScBoolPref("RENDER_INLINE_IMAGES", true, R.string.sc_pref_render_inline_images_title, R.string.sc_pref_render_inline_images_summary, authorsChoice = true, upstreamChoice = false)
 
     // Advanced theming options - Light theme
     val BUBBLE_BG_LIGHT_OUTGOING = ScColorPref("BUBBLE_BG_LIGHT_OUTGOING", R.string.sc_pref_bubble_color_outgoing_title)
@@ -166,6 +166,7 @@ object ScPrefs {
         )),
         ScPrefCategory(R.string.sc_pref_category_timeline, null, listOf(
             SC_TIMELINE_LAYOUT,
+            RENDER_INLINE_IMAGES,
             FLOATING_DATE,
             PINNED_MESSAGE_OVERLAY,
             PINNED_MESSAGE_TOOLBAR_ACTION,
@@ -181,7 +182,6 @@ object ScPrefs {
                     SPACE_MANAGEMENT,
                 )),
                 ScPrefCategory(R.string.sc_pref_category_timeline, null, listOf(
-                    RENDER_INLINE_IMAGES,
                     PL_DISPLAY_NAME,
                     JUMP_TO_UNREAD,
                     SYNC_READ_RECEIPT_AND_MARKER,