diff --git a/src/app/molecules/media/Media.jsx b/src/app/molecules/media/Media.jsx
index e2b61775cb..dea58a606d 100644
--- a/src/app/molecules/media/Media.jsx
+++ b/src/app/molecules/media/Media.jsx
@@ -15,6 +15,8 @@ import ExternalSVG from '../../../../public/res/ic/outlined/external.svg';
 import PlaySVG from '../../../../public/res/ic/outlined/play.svg';
 
 import { getBlobSafeMimeType } from '../../../util/mimetypes';
+import initMatrix from '../../../client/initMatrix';
+import settings from '../../../client/state/settings';
 
 async function getDecryptedBlob(response, type, decryptData) {
   const arrayBuffer = await response.arrayBuffer();
@@ -361,6 +363,202 @@ Video.propTypes = {
   blurhash: PropTypes.string,
 };
 
+function IframePlayer({
+  children, link, sitename, title, thumbnail,
+}) {
+  const [videoStarted, setVideoStarted] = useState(false);
+
+  const handlePlayVideo = () => {
+    setVideoStarted(true);
+  };
+
+  return (
+    <div className="iframeplayer">
+      <div className="file-container">
+        <div className="file-header">
+          <Text className="file-name" variant="b3">{`${sitename} - ${title}`}</Text>
+
+          <IconButton
+            size="extra-small"
+            tooltip="Open in new tab"
+            src={ExternalSVG}
+            onClick={() => window.open(link)}
+          />
+        </div>
+
+        <div className="video-container">
+          {videoStarted ? (
+            <div>
+              {children}
+            </div>
+          ) : (
+            <>
+              <img src={thumbnail} alt={`${sitename} thumbnail`} />
+              <IconButton onClick={handlePlayVideo} tooltip="Play video" src={PlaySVG} />
+            </>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}
+IframePlayer.propTypes = {
+  children: PropTypes.node.isRequired,
+  link: PropTypes.string.isRequired,
+  sitename: PropTypes.string.isRequired,
+  title: PropTypes.string.isRequired,
+  thumbnail: PropTypes.string.isRequired,
+};
+
+function Embed({ link }) {
+  const url = new URL(link);
+
+  if (settings.showYoutubeEmbedPlayer && (((url.host === 'www.youtube.com' || url.host === 'youtube.com') && (url.pathname === '/watch' || url.pathname.startsWith('/shorts/'))) || url.host === 'youtu.be' || url.host === 'www.youtu.be')) {
+    return <YoutubeEmbed link={link} />;
+  }
+
+  const [urlPreviewInfo, setUrlPreviewInfo] = useState();
+  const mx = initMatrix.matrixClient;
+
+  useEffect(() => {
+    let unmounted = false;
+
+    async function getUrlPreview() {
+      try {
+        const info = await mx.getUrlPreview(link, 0);
+        if (unmounted) return;
+        setUrlPreviewInfo(info);
+      } catch {
+        setUrlPreviewInfo();
+      }
+    }
+
+    getUrlPreview();
+
+    return () => {
+      unmounted = true;
+    };
+  });
+
+  if (urlPreviewInfo != null) {
+    const imageURL = urlPreviewInfo['og:image'] || urlPreviewInfo['og:image:secure_url'];
+    const image = (imageURL != null) ? (
+      <Image
+        link={mx.mxcUrlToHttp(imageURL)}
+        height={urlPreviewInfo['og:image:height'] != null ? parseInt(urlPreviewInfo['og:image:height'], 10) : null}
+        width={urlPreviewInfo['og:image:width'] != null ? parseInt(urlPreviewInfo['og:image:width'], 10) : null}
+        name={urlPreviewInfo['og:image:alt'] || urlPreviewInfo['og:site_name'] || ''}
+        type={urlPreviewInfo['og:image:type'] != null ? urlPreviewInfo['og:image:type'] : null}
+      />
+    ) : null;
+
+    // Image only embed
+    if (image != null && urlPreviewInfo['og:title'] == null && urlPreviewInfo['og:description'] == null) {
+      return (
+        <div className="embed-container">
+          <div className="file-container">
+            {image}
+          </div>
+        </div>
+      );
+    }
+
+    const embedTitle = urlPreviewInfo['og:title'] || urlPreviewInfo['og:site_name'];
+
+    return (
+      <div className="embed-container">
+        <div className="file-container embed">
+          <div className="embed-text">
+            {(embedTitle != null) && (
+              <Text className="embed-title" variant="h2">
+                {embedTitle}
+              </Text>
+            )}
+
+            {(urlPreviewInfo['og:description'] != null) && (
+              <Text className="embed-description" variant="b3">
+                {urlPreviewInfo['og:description']}
+              </Text>
+            )}
+          </div>
+
+          <div className="embed-media">
+            {image}
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  return null;
+}
+Embed.propTypes = {
+  link: PropTypes.string.isRequired,
+};
+
+function YoutubeEmbed({ link }) {
+  const [urlPreviewInfo, setUrlPreviewInfo] = useState(null);
+  const mx = initMatrix.matrixClient;
+  const url = new URL(link);
+
+  // fix for no embed information on www.youtu.be
+  if (url.host === 'www.youtu.be') {
+    url.host = 'youtu.be';
+  }
+
+  useEffect(() => {
+    let unmounted = false;
+
+    async function getThumbnail() {
+      const info = await mx.getUrlPreview(url.toString(), 0);
+      if (unmounted) return;
+
+      setUrlPreviewInfo(info);
+    }
+
+    getThumbnail();
+
+    return () => {
+      unmounted = true;
+    };
+  });
+
+  let videoID;
+  if (url.host === 'youtu.be' || url.host === 'www.youtu.be') {
+    videoID = url.pathname.slice(1);
+  } else if (url.pathname.startsWith('/shorts/')) {
+    videoID = url.pathname.slice(8);
+  } else {
+    videoID = url.searchParams.get('v');
+  }
+
+  let embedURL = `https://www.youtube-nocookie.com/embed/${videoID}?autoplay=1`;
+  if (url.searchParams.has('t')) { // timestamp flag
+    embedURL += `&start=${url.searchParams.get('t')}`;
+  }
+
+  if (urlPreviewInfo !== null) {
+    return (
+      <div className="embed-container">
+        <IframePlayer link={link} sitename="Youtube" title={urlPreviewInfo['og:title']} thumbnail={mx.mxcUrlToHttp(urlPreviewInfo['og:image'])}>
+          <iframe
+            src={embedURL}
+            title="YouTube video player"
+            frameBorder="0"
+            allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"
+            allowFullScreen
+          />
+        </IframePlayer>
+      </div>
+    );
+  }
+
+  return null;
+}
+YoutubeEmbed.propTypes = {
+  link: PropTypes.string.isRequired,
+};
+
 export {
-  File, Image, Sticker, Audio, Video,
+  File, Image, Sticker, Audio, Video, YoutubeEmbed, Embed, IframePlayer,
 };
diff --git a/src/app/molecules/media/Media.scss b/src/app/molecules/media/Media.scss
index 8d98c428e8..5b4a86620e 100644
--- a/src/app/molecules/media/Media.scss
+++ b/src/app/molecules/media/Media.scss
@@ -88,3 +88,18 @@
     width: 100%;
   }
 }
+
+.embed-container {
+  margin-top: 5px;
+
+  .embed {
+    color: var(--tc-surface-low);
+    background-color: var(--bg-surface-hover);
+    border-radius: calc(var(--bo-radius) / 2);
+    padding: 15px;
+
+    .embed-text {
+      margin-bottom: 5px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/app/molecules/message/Message.jsx b/src/app/molecules/message/Message.jsx
index 26a5b29dae..93145af0fc 100644
--- a/src/app/molecules/message/Message.jsx
+++ b/src/app/molecules/message/Message.jsx
@@ -5,6 +5,7 @@ import React, {
 import PropTypes from 'prop-types';
 import './Message.scss';
 
+import { find } from 'linkifyjs';
 import { twemojify } from '../../../util/twemojify';
 
 import initMatrix from '../../../client/initMatrix';
@@ -41,6 +42,8 @@ import BinIC from '../../../../public/res/ic/outlined/bin.svg';
 import { confirmDialog } from '../confirm-dialog/ConfirmDialog';
 import { getBlobSafeMimeType } from '../../../util/mimetypes';
 import { html, plain } from '../../../util/markdown';
+import { Embed } from '../media/Media';
+import settings from '../../../client/state/settings';
 
 function PlaceholderMessage() {
   return (
@@ -716,6 +719,11 @@ function getEditedBody(editedMEvent) {
   return [parsedContent.body, isCustomHTML, newContent.formatted_body ?? null];
 }
 
+function findLinks(body) {
+  return find(body, 'url')
+    .filter((v, i, a) => a.findIndex((v2) => (v2.href === v.href)) === i);
+}
+
 function Message({
   mEvent, isBodyOnly, roomTimeline,
   focus, fullTime, isEdit, setEdit, cancelEdit,
@@ -801,6 +809,9 @@ function Message({
             isEdited={isEdited}
           />
         )}
+        {settings.showUrlPreview && msgType === 'm.text' && findLinks(body).map((link) => (
+          <Embed key={link.href} link={link.href} />
+        ))}
         {isEdit && (
           <MessageEdit
             body={(customHTML
diff --git a/src/app/organisms/navigation/Selector.jsx b/src/app/organisms/navigation/Selector.jsx
index cb1086eaa4..62c8a935b2 100644
--- a/src/app/organisms/navigation/Selector.jsx
+++ b/src/app/organisms/navigation/Selector.jsx
@@ -17,6 +17,7 @@ import SpaceOptions from '../../molecules/space-options/SpaceOptions';
 import VerticalMenuIC from '../../../../public/res/ic/outlined/vertical-menu.svg';
 
 import { useForceUpdate } from '../../hooks/useForceUpdate';
+import settings from '../../../client/state/settings';
 
 function Selector({
   roomId, isDM, drawerPostie, onClick,
@@ -57,8 +58,8 @@ function Selector({
       key={roomId}
       name={room.name}
       roomId={roomId}
-      imageSrc={isDM ? imageSrc : null}
-      iconSrc={isDM ? null : joinRuleToIconSrc(room.getJoinRule(), room.isSpaceRoom())}
+      imageSrc={isDM || settings.showRoomListAvatar ? imageSrc : null}
+      iconSrc={isDM || settings.showRoomListAvatar ? null : joinRuleToIconSrc(room.getJoinRule(), room.isSpaceRoom())}
       isSelected={navigation.selectedRoomId === roomId}
       isMuted={isMuted}
       isUnread={!isMuted && noti.hasNoti(roomId)}
diff --git a/src/app/organisms/settings/Settings.jsx b/src/app/organisms/settings/Settings.jsx
index a0869b6154..b75a499ec4 100644
--- a/src/app/organisms/settings/Settings.jsx
+++ b/src/app/organisms/settings/Settings.jsx
@@ -7,7 +7,8 @@ import settings from '../../../client/state/settings';
 import navigation from '../../../client/state/navigation';
 import {
   toggleSystemTheme, toggleMarkdown, toggleMembershipEvents, toggleNickAvatarEvents,
-  toggleNotifications, toggleNotificationSounds,
+  toggleNotifications, toggleNotificationSounds, toggleShowRoomListAvatar,
+  toggleShowYoutubeEmbedPlayer, toggleShowUrlPreview,
 } from '../../../client/action/settings';
 import { usePermission } from '../../hooks/usePermission';
 
@@ -80,6 +81,40 @@ function AppearanceSection() {
             />
         )}
         />
+        <SettingTile
+          title="Show room-list avatar"
+          options={(
+            <Toggle
+              isActive={settings.showRoomListAvatar}
+              onToggle={() => { toggleShowRoomListAvatar(); updateState({}); }}
+            />
+          )}
+          content={<Text variant="b3">Will show room avatars in the room list.</Text>}
+        />
+      </div>
+      <div className="settings-appearance__card">
+        <MenuHeader>URL Previews</MenuHeader>
+        <SettingTile
+          title="Show URL previews"
+          options={(
+            <Toggle
+              isActive={settings.showUrlPreview}
+              onToggle={() => { toggleShowUrlPreview(); updateState({}); }}
+            />
+              )}
+          content={<Text variant="b3">Show additional info about urls.</Text>}
+        />
+        <SettingTile
+          title="Show Youtube embed player"
+          options={(
+            <Toggle
+              isActive={settings.showYoutubeEmbedPlayer}
+              onToggle={() => { toggleShowYoutubeEmbedPlayer(); updateState({}); }}
+              disabled={!settings.showUrlPreview}
+            />
+              )}
+          content={<Text variant="b3">Will show a youtube embed player for youtube links.</Text>}
+        />
       </div>
       <div className="settings-appearance__card">
         <MenuHeader>Room messages</MenuHeader>
diff --git a/src/client/action/settings.js b/src/client/action/settings.js
index 7b539c8d74..5789b01bb2 100644
--- a/src/client/action/settings.js
+++ b/src/client/action/settings.js
@@ -42,3 +42,21 @@ export function toggleNotificationSounds() {
     type: cons.actions.settings.TOGGLE_NOTIFICATION_SOUNDS,
   });
 }
+
+export function toggleShowRoomListAvatar() {
+  appDispatcher.dispatch({
+    type: cons.actions.settings.TOGGLE_SHOW_ROOM_LIST_AVATAR,
+  });
+}
+
+export function toggleShowYoutubeEmbedPlayer() {
+  appDispatcher.dispatch({
+    type: cons.actions.settings.TOGGLE_SHOW_YOUTUBE_EMBED_PLAYER,
+  });
+}
+
+export function toggleShowUrlPreview() {
+  appDispatcher.dispatch({
+    type: cons.actions.settings.TOGGLE_SHOW_URL_PREVIEW,
+  });
+}
diff --git a/src/client/state/cons.js b/src/client/state/cons.js
index 873c4e3335..c15dc6e146 100644
--- a/src/client/state/cons.js
+++ b/src/client/state/cons.js
@@ -82,6 +82,9 @@ const cons = {
       TOGGLE_NICKAVATAR_EVENT: 'TOGGLE_NICKAVATAR_EVENT',
       TOGGLE_NOTIFICATIONS: 'TOGGLE_NOTIFICATIONS',
       TOGGLE_NOTIFICATION_SOUNDS: 'TOGGLE_NOTIFICATION_SOUNDS',
+      TOGGLE_SHOW_ROOM_LIST_AVATAR: 'TOGGLE_SHOW_ROOM_LIST_AVATAR',
+      TOGGLE_SHOW_YOUTUBE_EMBED_PLAYER: 'TOGGLE_SHOW_YOUTUBE_EMBED_PLAYER',
+      TOGGLE_SHOW_URL_PREVIEW: 'TOGGLE_SHOW_URL_PREVIEW',
     },
   },
   events: {
@@ -154,6 +157,9 @@ const cons = {
       NICKAVATAR_EVENTS_TOGGLED: 'NICKAVATAR_EVENTS_TOGGLED',
       NOTIFICATIONS_TOGGLED: 'NOTIFICATIONS_TOGGLED',
       NOTIFICATION_SOUNDS_TOGGLED: 'NOTIFICATION_SOUNDS_TOGGLED',
+      SHOW_ROOM_LIST_AVATAR_TOGGLED: 'SHOW_ROOM_LIST_AVATAR_TOGGLED',
+      SHOW_YOUTUBE_EMBED_PLAYER_TOGGLED: 'SHOW_YOUTUBE_EMBED_PLAYER_TOGGLED',
+      TOGGLE_SHOW_URL_PREVIEW: 'TOGGLE_SHOW_URL_PREVIEW',
     },
   },
 };
diff --git a/src/client/state/settings.js b/src/client/state/settings.js
index af2e279ad3..e47bc0283f 100644
--- a/src/client/state/settings.js
+++ b/src/client/state/settings.js
@@ -33,6 +33,9 @@ class Settings extends EventEmitter {
     this.hideNickAvatarEvents = this.getHideNickAvatarEvents();
     this._showNotifications = this.getShowNotifications();
     this.isNotificationSounds = this.getIsNotificationSounds();
+    this.showRoomListAvatar = this.getShowRoomListAvatar();
+    this.showYoutubeEmbedPlayer = this.getShowYoutubeEmbedPlayer();
+    this.showUrlPreview = this.getShowUrlPreview();
 
     this.darkModeQueryList = window.matchMedia('(prefers-color-scheme: dark)');
 
@@ -153,6 +156,54 @@ class Settings extends EventEmitter {
     return settings.isNotificationSounds;
   }
 
+  toggleShowRoomListAvatar() {
+    this.showRoomListAvatar = !this.showRoomListAvatar;
+    setSettings('showRoomListAvatar', this.showRoomListAvatar);
+
+    this.emit(cons.events.settings.SHOW_ROOM_LIST_AVATAR_TOGGLED, this.showRoomListAvatar);
+  }
+
+  getShowRoomListAvatar() {
+    if (typeof this.showRoomListAvatar === 'boolean') return this.showRoomListAvatar;
+
+    const settings = getSettings();
+    if (settings === null) return false;
+    if (typeof settings.showRoomListAvatar === 'undefined') return false;
+    return settings.showRoomListAvatar;
+  }
+
+  toggleShowYoutubeEmbedPlayer() {
+    this.showYoutubeEmbedPlayer = !this.showYoutubeEmbedPlayer;
+    setSettings('showYoutubeEmbedPlayer', this.showYoutubeEmbedPlayer);
+
+    this.emit(cons.events.settings.SHOW_YOUTUBE_EMBED_PLAYER_TOGGLED, this.showYoutubeEmbedPlayer);
+  }
+
+  getShowYoutubeEmbedPlayer() {
+    if (typeof this.showYoutubeEmbedPlayer === 'boolean') return this.showYoutubeEmbedPlayer;
+
+    const settings = getSettings();
+    if (settings === null) return false;
+    if (typeof settings.showYoutubeEmbedPlayer === 'undefined') return false;
+    return settings.showYoutubeEmbedPlayer;
+  }
+
+  toggleShowUrlPreview() {
+    this.showUrlPreview = !this.showUrlPreview;
+    setSettings('showUrlPreview', this.showUrlPreview);
+
+    this.emit(cons.events.settings.SHOW_URL_PREVIEW_TOGGLED, this.showUrlPreview);
+  }
+
+  getShowUrlPreview() {
+    if (typeof this.showUrlPreview === 'boolean') return this.showUrlPreview;
+
+    const settings = getSettings();
+    if (settings === null) return false;
+    if (typeof settings.showUrlPreview === 'undefined') return false;
+    return settings.showUrlPreview;
+  }
+
   setter(action) {
     const actions = {
       [cons.actions.settings.TOGGLE_SYSTEM_THEME]: () => {
@@ -192,6 +243,15 @@ class Settings extends EventEmitter {
         setSettings('isNotificationSounds', this.isNotificationSounds);
         this.emit(cons.events.settings.NOTIFICATION_SOUNDS_TOGGLED, this.isNotificationSounds);
       },
+      [cons.actions.settings.TOGGLE_SHOW_ROOM_LIST_AVATAR]: () => {
+        this.toggleShowRoomListAvatar();
+      },
+      [cons.actions.settings.TOGGLE_SHOW_YOUTUBE_EMBED_PLAYER]: () => {
+        this.toggleShowYoutubeEmbedPlayer();
+      },
+      [cons.actions.settings.TOGGLE_SHOW_URL_PREVIEW]: () => {
+        this.toggleShowUrlPreview();
+      },
     };
 
     actions[action.type]?.();