diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
index a9f4f1dba1..816fd8c33a 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
@@ -162,6 +162,11 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
         "useOnlyCurrentProfiles",
     ];
 
+    private static SAFETY_SETTINGS: BooleanSettingKey[] = [
+        "showAvatarsOnInvites",
+        "showImages", // "Show media in timeline"
+    ];
+
     private static ROOM_DIRECTORY_SETTINGS: BooleanSettingKey[] = ["SpotlightSearch.showNsfwPublicRooms"];
 
     private static GENERAL_SETTINGS: BooleanSettingKey[] = [
@@ -334,6 +339,10 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
                         {this.renderGroup(PreferencesUserSettingsTab.TIMELINE_SETTINGS)}
                     </SettingsSubsection>
 
+                    <SettingsSubsection heading={_t("common|moderation_and_safety")}>
+                        {this.renderGroup(PreferencesUserSettingsTab.SAFETY_SETTINGS)}
+                    </SettingsSubsection>
+
                     <SettingsSubsection heading={_t("settings|preferences|room_directory_heading")}>
                         {this.renderGroup(PreferencesUserSettingsTab.ROOM_DIRECTORY_SETTINGS)}
                     </SettingsSubsection>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 540e2e2837..8af1f7944a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2681,7 +2681,8 @@
             "unable_to_load_msisdns": "Unable to load phone numbers",
             "username": "Username"
         },
-        "image_thumbnails": "Show previews/thumbnails for images",
+        "show_media": "Show media in timeline",
+        "show_media_description": "A hidden media can always be shown by tapping on it",
         "inline_url_previews_default": "Enable inline URL previews by default",
         "inline_url_previews_room": "Enable URL previews by default for participants in this room",
         "inline_url_previews_room_account": "Enable URL previews for this room (only affects you)",