diff --git a/.changeset/add_multiple_previews.md b/.changeset/add_multiple_previews.md
new file mode 100644
index 000000000..7e1d70782
--- /dev/null
+++ b/.changeset/add_multiple_previews.md
@@ -0,0 +1,5 @@
+---
+default: minor
+---
+
+Reorganize Embed settings and reintroduce multiple embeds
diff --git a/.gitignore b/.gitignore
index d6c83cfb1..7ec719709 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,6 @@ build.sh
 
 # the following line was added with the "git ignore" tool by itsrye.dev, version 0.1.0
 .lh
+
+# the following line was added with nvim by Shea because its annoying to clear every so often
+.vscode/bookmarks.json
diff --git a/src/app/components/RenderMessageContent.tsx b/src/app/components/RenderMessageContent.tsx
index cfc95b2cd..f7908c7bf 100644
--- a/src/app/components/RenderMessageContent.tsx
+++ b/src/app/components/RenderMessageContent.tsx
@@ -84,6 +84,7 @@ function RenderMessageContentInternal({
 
   const [autoplayGifs] = useSetting(settingsAtom, 'autoplayGifs');
   const [captionPosition] = useSetting(settingsAtom, 'captionPosition');
+  const [multiplePreviews] = useSetting(settingsAtom, 'multiplePreviews');
   const settingsLinkBaseUrl = useSettingsLinkBaseUrl();
   const captionPositionMap = {
     [CaptionPosition.Above]: 'column-reverse',
@@ -117,8 +118,7 @@ function RenderMessageContentInternal({
         type: getMediaType(url),
       }));
 
-      const mediaLinks = analyzed.filter((item) => item.type !== null);
-      const toRender = mediaLinks.length > 0 ? mediaLinks : [analyzed[0]];
+      const toRender = multiplePreviews ? analyzed : [analyzed[0]];
       return (
         <UrlPreviewHolder>
           {toRender.map(({ url, type }) => {
@@ -136,7 +136,7 @@ function RenderMessageContentInternal({
         </UrlPreviewHolder>
       );
     },
-    [ts, clientUrlPreview, settingsLinkBaseUrl, urlPreview]
+    [multiplePreviews, settingsLinkBaseUrl, clientUrlPreview, urlPreview, ts]
   );
   const renderBundledPreviews = useCallback(
     (bundles: IPreviewUrlResponse[]) => (
diff --git a/src/app/components/message/content/ImageContent.tsx b/src/app/components/message/content/ImageContent.tsx
index ad51d2a4f..60cb9cb09 100644
--- a/src/app/components/message/content/ImageContent.tsx
+++ b/src/app/components/message/content/ImageContent.tsx
@@ -197,6 +197,7 @@ export const ImageContent = as<'div', ImageContentProps>(
               hasDimensions ? css.AbsoluteContainer : undefined,
               blurred && css.Blur
             )}
+            style={{ width: '100%' }}
           >
             {renderImage({
               alt: body,
diff --git a/src/app/components/url-preview/UrlPreviewCard.tsx b/src/app/components/url-preview/UrlPreviewCard.tsx
index 63586b436..9e3dbdd1d 100644
--- a/src/app/components/url-preview/UrlPreviewCard.tsx
+++ b/src/app/components/url-preview/UrlPreviewCard.tsx
@@ -108,6 +108,15 @@ export const UrlPreviewCard = as<
       }
     };
 
+    const ogW = ((prev['og:video'] && prev['og:video:width']) ||
+      (prev['og:image'] && prev['og:image:width']) ||
+      1) as number;
+    const ogH = ((prev['og:video'] && prev['og:video:height']) ||
+      (prev['og:image'] && prev['og:image:height']) ||
+      1) as number;
+
+    const aspectRatio = ogW && ogH ? `${ogW} / ${ogH}` : undefined;
+
     return (
       <Box
         grow="Yes"
@@ -153,9 +162,7 @@ export const UrlPreviewCard = as<
           <VideoContent
             style={{
               width: '100%',
-              aspectRatio:
-                ((prev['og:video:width'] as number) ?? 1) /
-                ((prev['og:video:height'] as number) ?? 1),
+              aspectRatio: aspectRatio ?? '10 / 9',
             }}
             body={prev['og:title']}
             info={{}}
@@ -167,43 +174,44 @@ export const UrlPreviewCard = as<
         )}
         {!prev['og:video'] &&
           prev['og:image'] &&
-          (() => {
-            const ogW = prev['og:image:width'];
-            const ogH = prev['og:image:height'];
-            const aspectRatio = ogW && ogH ? `${ogW} / ${ogH}` : undefined;
-            return (
-              <Box
+          (() => (
+            <Box
+              style={{
+                width: '100%',
+                maxHeight: '320px',
+                aspectRatio: aspectRatio ?? '16 / 9',
+                flexShrink: 1,
+                overflow: 'hidden',
+                position: 'relative',
+              }}
+            >
+              <ImageContent
                 style={{
                   width: '100%',
-                  maxHeight: '400px',
-                  aspectRatio: aspectRatio ?? '16 / 9',
-                  flexShrink: 0,
-                  overflow: 'hidden',
-                  position: 'relative',
+                  height: '100%',
+                  position: 'absolute',
+                  inset: 0,
+                  minHeight: 0,
                 }}
-              >
-                <ImageContent
-                  style={{ width: '100%', height: '100%', position: 'absolute', inset: 0 }}
-                  autoPlay
-                  onAuxClick={handleAuxClick}
-                  body={prev['og:title']}
-                  url={prev['og:image']}
-                  renderViewer={(p) => <ImageViewer {...p} />}
-                  renderImage={(p) => (
-                    <Image
-                      {...p}
-                      style={{
-                        width: '100%',
-                        height: '100%',
-                        objectFit: 'contain',
-                        objectPosition: 'center',
-                      }}
-                    />
-                  )}
-                />
-              </Box>
-            );
-          })()}
+                autoPlay
+                onAuxClick={handleAuxClick}
+                body={prev['og:title']}
+                url={prev['og:image']}
+                renderViewer={(p) => <ImageViewer {...p} />}
+                renderImage={(p) => (
+                  <Image
+                    {...p}
+                    style={{
+                      width: '100%',
+                      height: '100%',
+                      objectFit: 'contain',
+                      objectPosition: 'center',
+                    }}
+                  />
+                )}
+              />
+            </Box>
+          ))()}
         {!prev['og:video'] && !prev['og:image'] && prev['og:audio'] && (
           <Box className={css.UrlPreviewAudio} style={{ flexShrink: 0 }}>
             <AudioContent
@@ -262,8 +270,11 @@ export const UrlPreviewCard = as<
               minWidth: 0,
               maxWidth: '100%',
               margin: 0,
+              alignSelf: 'start',
+            }
+          : {
+              alignSelf: 'start',
             }
-          : undefined
       }
     >
       {previewContent}
@@ -345,24 +356,31 @@ export const UrlPreviewHolder = as<'div'>(({ children, ...props }, ref) => {
               </IconButton>
             </>
           )}
-          <Box ref={innerBoxRef} alignItems="Inherit" gap="200">
+          <Box
+            ref={innerBoxRef}
+            alignItems="Inherit"
+            gap="200"
+            style={{
+              alignItems: 'baseline',
+            }}
+          >
             {children}
-            {canScrollRight && (
-              <>
-                <div className={css.UrlPreviewHolderGradient({ position: 'Right' })} />
-                <IconButton
-                  className={css.UrlPreviewHolderBtn({ position: 'Right' })}
-                  variant="Primary"
-                  radii="Pill"
-                  size="300"
-                  outlined
-                  onClick={handleScrollFront}
-                >
-                  <Icon size="300" src={Icons.ArrowRight} />
-                </IconButton>
-              </>
-            )}
           </Box>
+          {canScrollRight && (
+            <>
+              <div className={css.UrlPreviewHolderGradient({ position: 'Right' })} />
+              <IconButton
+                className={css.UrlPreviewHolderBtn({ position: 'Right' })}
+                variant="Primary"
+                radii="Pill"
+                size="300"
+                outlined
+                onClick={handleScrollFront}
+              >
+                <Icon size="300" src={Icons.ArrowRight} />
+              </IconButton>
+            </>
+          )}
         </Box>
       </Scroll>
     </Box>
diff --git a/src/app/features/settings/general/General.tsx b/src/app/features/settings/general/General.tsx
index 6a5f7d5c5..a0844ce2b 100644
--- a/src/app/features/settings/general/General.tsx
+++ b/src/app/features/settings/general/General.tsx
@@ -882,18 +882,6 @@ function Messages() {
     'hideNickAvatarEvents'
   );
   const [mediaAutoLoad, setMediaAutoLoad] = useSetting(settingsAtom, 'mediaAutoLoad');
-  const [bundledPreview, setBundledPreview] = useSetting(settingsAtom, 'bundledPreview');
-  const [urlPreview, setUrlPreview] = useSetting(settingsAtom, 'urlPreview');
-  const [encUrlPreview, setEncUrlPreview] = useSetting(settingsAtom, 'encUrlPreview');
-  const [clientUrlPreview, setClientUrlPreview] = useSetting(settingsAtom, 'clientUrlPreview');
-  const [encClientUrlPreview, setEncClientUrlPreview] = useSetting(
-    settingsAtom,
-    'encClientUrlPreview'
-  );
-  const [clientPreviewYoutube, setClientPreviewYoutube] = useSetting(
-    settingsAtom,
-    'clientPreviewYoutube'
-  );
   const [showHiddenEvents, setShowHiddenEvents] = useSetting(settingsAtom, 'showHiddenEvents');
   const [showTombstoneEvents, setShowTombstoneEvents] = useSetting(
     settingsAtom,
@@ -947,6 +935,19 @@ function Messages() {
           />
         </SequenceCard>
       )}
+      <SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
+        <SettingTile
+          title="Disable Media Auto Load"
+          focusId="disable-media-auto-load"
+          after={
+            <Switch
+              variant="Primary"
+              value={!mediaAutoLoad}
+              onChange={(v) => setMediaAutoLoad(!v)}
+            />
+          }
+        />
+      </SequenceCard>
       <SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
         <SettingTile
           title="Hide Membership Change"
@@ -975,17 +976,81 @@ function Messages() {
       </SequenceCard>
       <SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
         <SettingTile
-          title="Disable Media Auto Load"
-          focusId="disable-media-auto-load"
+          title="Hide Member Events in Read-Only Rooms"
+          focusId="hide-member-events-read-only-rooms"
           after={
             <Switch
               variant="Primary"
-              value={!mediaAutoLoad}
-              onChange={(v) => setMediaAutoLoad(!v)}
+              value={hideMembershipInReadOnly}
+              onChange={setHideMembershipInReadOnly}
+            />
+          }
+        />
+      </SequenceCard>
+      <SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
+        <SettingTile
+          title="Show Hidden Events"
+          focusId="show-hidden-events"
+          after={
+            <Switch
+              variant="Primary"
+              value={showHiddenEvents}
+              onChange={setShowHiddenEvents}
+              title={
+                showHiddenEvents
+                  ? 'Disable to hide hidden events'
+                  : 'Enable to show hidden events, this will cause visual clutter in busy rooms.'
+              }
             />
           }
         />
       </SequenceCard>
+      <SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
+        <SettingTile
+          title="Show Tombstones for Redacted Messages"
+          focusId="show-redacted-message-tombstones"
+          after={
+            <Switch
+              variant="Primary"
+              value={showTombstoneEvents || showHiddenEvents}
+              onChange={setShowTombstoneEvents}
+              disabled={showHiddenEvents}
+              title={getTombstoneSettingToggleTitle(showHiddenEvents, showTombstoneEvents)}
+            />
+          }
+        />
+      </SequenceCard>
+    </Box>
+  );
+}
+
+function Embeds() {
+  const [multiplePreviews, setMultiplePreviews] = useSetting(settingsAtom, 'multiplePreviews');
+  const [bundledPreview, setBundledPreview] = useSetting(settingsAtom, 'bundledPreview');
+  const [urlPreview, setUrlPreview] = useSetting(settingsAtom, 'urlPreview');
+  const [encUrlPreview, setEncUrlPreview] = useSetting(settingsAtom, 'encUrlPreview');
+  const [clientUrlPreview, setClientUrlPreview] = useSetting(settingsAtom, 'clientUrlPreview');
+  const [encClientUrlPreview, setEncClientUrlPreview] = useSetting(
+    settingsAtom,
+    'encClientUrlPreview'
+  );
+  const [clientPreviewYoutube, setClientPreviewYoutube] = useSetting(
+    settingsAtom,
+    'clientPreviewYoutube'
+  );
+  return (
+    <Box direction="Column" gap="100">
+      <Text size="L400">Embeds</Text>
+      <SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
+        <SettingTile
+          title="Display Multiple Embeds"
+          focusId="display-multiple-embeds"
+          description="Display the embeds of all the links. Turning it off makes it only show the embed of the 1st item"
+          after={
+            <Switch variant="Primary" value={multiplePreviews} onChange={setMultiplePreviews} />
+          }
+        />
+      </SequenceCard>
       <SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
         <SettingTile
           title="Display Bundled Embeds"
@@ -1071,52 +1136,6 @@ function Messages() {
           }
         />
       </SequenceCard>
-      <SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
-        <SettingTile
-          title="Hide Member Events in Read-Only Rooms"
-          focusId="hide-member-events-read-only-rooms"
-          after={
-            <Switch
-              variant="Primary"
-              value={hideMembershipInReadOnly}
-              onChange={setHideMembershipInReadOnly}
-            />
-          }
-        />
-      </SequenceCard>
-      <SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
-        <SettingTile
-          title="Show Hidden Events"
-          focusId="show-hidden-events"
-          after={
-            <Switch
-              variant="Primary"
-              value={showHiddenEvents}
-              onChange={setShowHiddenEvents}
-              title={
-                showHiddenEvents
-                  ? 'Disable to hide hidden events'
-                  : 'Enable to show hidden events, this will cause visual clutter in busy rooms.'
-              }
-            />
-          }
-        />
-      </SequenceCard>
-      <SequenceCard className={SequenceCardStyle} variant="SurfaceVariant" direction="Column">
-        <SettingTile
-          title="Show Tombstones for Redacted Messages"
-          focusId="show-redacted-message-tombstones"
-          after={
-            <Switch
-              variant="Primary"
-              value={showTombstoneEvents || showHiddenEvents}
-              onChange={setShowTombstoneEvents}
-              disabled={showHiddenEvents}
-              title={getTombstoneSettingToggleTitle(showHiddenEvents, showTombstoneEvents)}
-            />
-          }
-        />
-      </SequenceCard>
     </Box>
   );
 }
@@ -1408,6 +1427,7 @@ export function General({ requestBack, requestClose }: Readonly<GeneralProps>) {
               <Gestures isMobile={mobileOrTablet()} />
               <Editor isMobile={mobileOrTablet()} />
               <Messages />
+              <Embeds />
               <Calls />
               <SettingsSyncSection />
               <DiagnosticsAndPrivacy />
diff --git a/src/app/state/settings.ts b/src/app/state/settings.ts
index e26fff911..16be2770d 100644
--- a/src/app/state/settings.ts
+++ b/src/app/state/settings.ts
@@ -53,6 +53,7 @@ export interface Settings {
   legacyUsernameColor: boolean;
 
   mediaAutoLoad: boolean;
+  multiplePreviews: boolean;
   bundledPreview: boolean;
   urlPreview: boolean;
   encUrlPreview: boolean;
@@ -148,6 +149,7 @@ const defaultSettings: Settings = {
   hideMembershipEvents: false,
   hideNickAvatarEvents: true,
   mediaAutoLoad: true,
+  multiplePreviews: true,
   bundledPreview: true,
   urlPreview: true,
   encUrlPreview: false,