From 4d4dcf1f7baf4cfaa1784940e479fd432d7e9af1 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 17 Sep 2025 08:35:55 +0200
Subject: [PATCH] Element v1.11.112

---
 element-desktop                               |  2 +-
 element-web                                   |  2 +-
 graphics/icon_gen.sh                          | 47 +++++--------------
 matrix-js-sdk                                 |  2 +-
 ...hildi-fetch-package.ts-modifications.patch |  2 +-
 ...0002-Change-default-login-background.patch |  2 +-
 .../0003-Don-t-welcome-to-Element.patch       |  2 +-
 ...ackground-to-ensure-contrast-of-our-.patch |  2 +-
 .../0005-Schildify-login-footer.patch         |  2 +-
 .../0006-Disable-sticky-rooms.patch           |  2 +-
 .../0007-Bring-back-unified-room-list.patch   | 10 ++--
 ...-rooms-to-bottom-I-still-want-to-see.patch |  2 +-
 .../0009-Don-t-preview-reactions.patch        |  2 +-
 ...tification-state-the-same-way-as-the.patch |  2 +-
 ...llow-muted-rooms-to-render-as-unread.patch |  2 +-
 .../0012-Increase-default-visible-tiles.patch |  2 +-
 ...paceDMBadges-setting-force-enabled-f.patch |  8 ++--
 ...m-reactions-from-tadzik-freeform-rea.patch |  2 +-
 ...5-Allow-reactions-to-take-more-space.patch |  2 +-
 ...don-t-automatically-show-last-opened.patch | 12 ++---
 ...0017-Exclude-spaces-from-breadcrumbs.patch |  4 +-
 .../0018-Stop-the-search-bar-wobble.patch     |  2 +-
 ...9-Import-SC-compound-theme-overrides.patch |  2 +-
 ...-damn-avatar-background-in-room-list.patch |  2 +-
 ...in-1-1-chats-Close-SchildiChat-schil.patch |  2 +-
 ...ner-radius-to-all-edges-of-the-bubbl.patch |  2 +-
 ...23-Always-show-timestamps-by-default.patch |  4 +-
 ...le-custom-emote-rendering-by-default.patch |  4 +-
 ...0025-Enable-chat-previews-by-default.patch |  2 +-
 ...-showing-people-in-spaces-by-default.patch |  4 +-
 ...7-Improve-IRC-layout-for-SchildiChat.patch |  2 +-
 31 files changed, 57 insertions(+), 82 deletions(-)

diff --git a/element-desktop b/element-desktop
index 5f33555..4970f98 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 5f33555767c6cb2abb60bb81bdaa70e063967bbc
+Subproject commit 4970f98fa2a99b779238fabb545ef0fd4fca92f9
diff --git a/element-web b/element-web
index b569e90..86076c0 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit b569e909481ee598112e5e6f87cc338844310298
+Subproject commit 86076c05ce70fdb3705ae01260068be316108711
diff --git a/graphics/icon_gen.sh b/graphics/icon_gen.sh
index 32f3a81..56183b4 100755
--- a/graphics/icon_gen.sh
+++ b/graphics/icon_gen.sh
@@ -25,6 +25,9 @@ export_square() {
     in="$2"
     out="$3"
     export_rect "$1" "$size" "$in" "$out"
+    if [[ "$out" == *.png ]]; then
+        pngcrush -ow "$out"
+    fi
 }
 
 repo_dir="$SCHILDI_ROOT/element-web"
@@ -50,50 +53,22 @@ export_rect 256 125 "$mydir/feature_image.svg" "$base_out/mstile-310x150.png"
 magick "$base_out/48.png" "$base_out/favicon.ico"
 rm "$base_out/48.png" # this was only created for favicon.ico
 
-for f in "$base_out"/*.png; do
-    pngcrush -ow "$f"
-done
-
 
 cp "$mydir/ic_launcher_sc.svg" "$repo_dir/res/themes/element/img/logos/element-logo.svg"
 
 export_square 320 "$mydir/ic_launcher_sc.svg" "$repo_dir/res/themes/element/img/logos/element-app-logo.png"
 
+
 repo_dir="$SCHILDI_ROOT/element-desktop"
-base_out="$repo_dir/res/img"
-
-export_square 256 "$mydir/ic_launcher_sc.svg" "$base_out/element.png"
-magick "$base_out/element.png" "$base_out/element.ico"
-
-# TODO monochrome icon? Unless https://github.com/element-hq/element-desktop/pull/1934 is what we'll end with
-export_square 256 "$mydir/ic_launcher_sc.svg" "$base_out/monochrome.png"
-magick "$base_out/element.png" "$base_out/monochrome.ico"
-
-for f in "$base_out"/*.png; do
-    pngcrush -ow "$f"
-done
-
-
-
-
 base_out="$repo_dir/build"
 
-for i in 16 24 48 64 96 128 256 512 1024; do
-    export_square "$i" "$mydir/ic_launcher_sc.svg" "$base_out/icons/$i"x"$i.png"
-done
-
-export_square "320" "$mydir/ic_launcher_sc.svg" "$base_out/install-spinner.png"
-pngcrush "$base_out/install-spinner.png"
-magick "$base_out/install-spinner.png" "$base_out/install-spinner.gif"
-rm  "$base_out/install-spinner.png"
-
-magick "$base_out/icons/256x256.png" "$base_out/icon.ico"
-magick "$base_out/icons/1024x1024.png" "$base_out/icon.icns"
-rm "$base_out/icons/1024x1024.png"
-
-for f in "$base_out/icons"/*.png; do
-    pngcrush -ow "$f"
-done
+export_square 512 "$mydir/ic_launcher_sc.svg" "$base_out/icon.png"
+export_square 256 "$mydir/ic_launcher_sc.svg" "$base_out/icon256_tmp.png"
+magick "$base_out/icon256_tmp.png" "$base_out/icon.ico"
+rm "$base_out/icon256_tmp.png"
+export_square 1024 "$mydir/ic_launcher_sc.svg" "$base_out/icon1024_tmp.png"
+magick "$base_out/icon1024_tmp.png" "$base_out/icon.icns"
+rm "$base_out/icon1024_tmp.png"
 
 
 if [[ "$automatic_commit" == [Yy]* ]]; then
diff --git a/matrix-js-sdk b/matrix-js-sdk
index a8d75b8..4a9006a 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit a8d75b81e549f3195ed92c34d428af12a2cb1088
+Subproject commit 4a9006aea68f9d4d7fad3965e754e89b03fb286f
diff --git a/patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch b/patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch
index ada549c..bd4bc38 100644
--- a/patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch
+++ b/patches/element-desktop/0002-Add-back-schildi-fetch-package.ts-modifications.patch
@@ -1,4 +1,4 @@
-From ff185dbcb6ded107c99525c9f30fdda84ad925ed Mon Sep 17 00:00:00 2001
+From ecaabac117155c75dc2788545ad89bcd8761e6f6 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sat, 2 Dec 2023 12:57:26 +0100
 Subject: Add back schildi fetch-package.ts modifications
diff --git a/patches/element-web/0002-Change-default-login-background.patch b/patches/element-web/0002-Change-default-login-background.patch
index 6a16253..fe7ab61 100644
--- a/patches/element-web/0002-Change-default-login-background.patch
+++ b/patches/element-web/0002-Change-default-login-background.patch
@@ -1,4 +1,4 @@
-From ddd2a2c080be4283db712a5e5ad1c502240fcafa Mon Sep 17 00:00:00 2001
+From 8c704fc902b1a6c56ab32ef29b5bae3e60191ee5 Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Sun, 29 Nov 2020 23:30:59 +0100
 Subject: Change default login background
diff --git a/patches/element-web/0003-Don-t-welcome-to-Element.patch b/patches/element-web/0003-Don-t-welcome-to-Element.patch
index fb9458d..bc54e33 100644
--- a/patches/element-web/0003-Don-t-welcome-to-Element.patch
+++ b/patches/element-web/0003-Don-t-welcome-to-Element.patch
@@ -1,4 +1,4 @@
-From 5c4f83a01d98fe7789f6d2d4c95a517348e74200 Mon Sep 17 00:00:00 2001
+From 48dd2747d8836ab5eff5d178222046a9f85b068e Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 27 Oct 2024 19:38:47 +0100
 Subject: Don't welcome to Element
diff --git a/patches/element-web/0004-Stronger-login-background-to-ensure-contrast-of-our-.patch b/patches/element-web/0004-Stronger-login-background-to-ensure-contrast-of-our-.patch
index 0011cf7..9d4eaca 100644
--- a/patches/element-web/0004-Stronger-login-background-to-ensure-contrast-of-our-.patch
+++ b/patches/element-web/0004-Stronger-login-background-to-ensure-contrast-of-our-.patch
@@ -1,4 +1,4 @@
-From 8eedb59210b4a5e3b93463b328e643bd5386fe7b Mon Sep 17 00:00:00 2001
+From 1fce0445adfc9fed94951cfb9a9e370da8f4ef77 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 27 Oct 2024 19:55:30 +0100
 Subject: Stronger login background to ensure contrast of our icon with our bg
diff --git a/patches/element-web/0005-Schildify-login-footer.patch b/patches/element-web/0005-Schildify-login-footer.patch
index 2196ee7..5e3b35a 100644
--- a/patches/element-web/0005-Schildify-login-footer.patch
+++ b/patches/element-web/0005-Schildify-login-footer.patch
@@ -1,4 +1,4 @@
-From 11b913b69a67a1fd6252aaee237a822488e32fa6 Mon Sep 17 00:00:00 2001
+From fb8b9391edb5bfeff518c45a067ef7682fbd51b3 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 27 Oct 2024 20:07:30 +0100
 Subject: Schildify login footer
diff --git a/patches/element-web/0006-Disable-sticky-rooms.patch b/patches/element-web/0006-Disable-sticky-rooms.patch
index 4ea47a5..6873d44 100644
--- a/patches/element-web/0006-Disable-sticky-rooms.patch
+++ b/patches/element-web/0006-Disable-sticky-rooms.patch
@@ -1,4 +1,4 @@
-From 8533b0d11bc4f4fbbff11a787e513cd57bb2c2ce Mon Sep 17 00:00:00 2001
+From 842db7d38306adb8b9f552c9cb857d327a2048e8 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Tue, 18 Jan 2022 13:28:22 +0100
 Subject: Disable sticky rooms
diff --git a/patches/element-web/0007-Bring-back-unified-room-list.patch b/patches/element-web/0007-Bring-back-unified-room-list.patch
index ab7543e..184b5ad 100644
--- a/patches/element-web/0007-Bring-back-unified-room-list.patch
+++ b/patches/element-web/0007-Bring-back-unified-room-list.patch
@@ -1,4 +1,4 @@
-From 319bdbd9de852eaf20f2e9dc030fa772e32ad76f Mon Sep 17 00:00:00 2001
+From 63a20f24caca99c9fc2f94931bfbb4b94fc5488c Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 5 May 2024 10:12:17 +0200
 Subject: Bring back unified room list
@@ -128,7 +128,7 @@ index 6be226a172..dbb69d8f62 100644
                  (this.props.activeSpace === MetaSpace.Favourites && orderedTagId !== DefaultTagID.Favourite) ||
                  (this.props.activeSpace === MetaSpace.People && orderedTagId !== DefaultTagID.DM) ||
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index 3adb29a23e..5451a2b8d9 100644
+index f0f52bbbf8..3a9f107565 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
 @@ -370,6 +370,14 @@ export type BooleanSettingKey = Assignable<Settings, IBaseSetting<boolean>> | Fe
@@ -147,10 +147,10 @@ index 3adb29a23e..5451a2b8d9 100644
          isFeature: true,
          labsGroup: LabGroup.VoiceAndVideo,
 diff --git a/src/stores/room-list/RoomListStore.ts b/src/stores/room-list/RoomListStore.ts
-index 2fc396b8b3..0739857b0b 100644
+index c6675d7aa5..e4c48dd1f7 100644
 --- a/src/stores/room-list/RoomListStore.ts
 +++ b/src/stores/room-list/RoomListStore.ts
-@@ -494,6 +494,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
+@@ -492,6 +492,9 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
                  this.setAndPersistListOrder(tag, listOrder);
              }
          }
@@ -160,7 +160,7 @@ index 2fc396b8b3..0739857b0b 100644
      }
  
      private onAlgorithmListUpdated = (forceUpdate: boolean): void => {
-@@ -607,7 +610,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
+@@ -605,7 +608,21 @@ export class RoomListStoreClass extends AsyncStoreWithClient<EmptyObject> implem
       */
      public getTagsForRoom(room: Room): TagID[] {
          const algorithmTags = this.algorithm.getTagsForRoom(room);
diff --git a/patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch b/patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch
index 56de22c..6be99f8 100644
--- a/patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch
+++ b/patches/element-web/0008-Don-t-sort-muted-rooms-to-bottom-I-still-want-to-see.patch
@@ -1,4 +1,4 @@
-From 23d8a99ffcc1a1c62cf1b8925e0bd624ea695736 Mon Sep 17 00:00:00 2001
+From 5cf03f81782a056678c09df9dceeb36479df9c19 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 17 Dec 2023 11:11:58 +0100
 Subject: Don't sort muted rooms to bottom, I still want to see them.
diff --git a/patches/element-web/0009-Don-t-preview-reactions.patch b/patches/element-web/0009-Don-t-preview-reactions.patch
index 07d4939..4733b7d 100644
--- a/patches/element-web/0009-Don-t-preview-reactions.patch
+++ b/patches/element-web/0009-Don-t-preview-reactions.patch
@@ -1,4 +1,4 @@
-From d358b9d7f06ecec08a0e96028401559e53f800f0 Mon Sep 17 00:00:00 2001
+From cb13fa5d01e40ec5e51dd4691a932ad676c471d2 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Thu, 14 Dec 2023 10:32:10 +0100
 Subject: Don't preview reactions
diff --git a/patches/element-web/0010-Hide-the-mute-notification-state-the-same-way-as-the.patch b/patches/element-web/0010-Hide-the-mute-notification-state-the-same-way-as-the.patch
index 3170e35..0204738 100644
--- a/patches/element-web/0010-Hide-the-mute-notification-state-the-same-way-as-the.patch
+++ b/patches/element-web/0010-Hide-the-mute-notification-state-the-same-way-as-the.patch
@@ -1,4 +1,4 @@
-From 049e659f6aa7c978c3b466358c4c80b17aac1666 Mon Sep 17 00:00:00 2001
+From c53a8446016c2157dbc7b2735f45fb1d3b74c883 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Wed, 17 Nov 2021 12:50:25 +0100
 Subject: Hide the "mute" notification state the same way as the other states
diff --git a/patches/element-web/0011-Allow-muted-rooms-to-render-as-unread.patch b/patches/element-web/0011-Allow-muted-rooms-to-render-as-unread.patch
index b0ee835..6e2198f 100644
--- a/patches/element-web/0011-Allow-muted-rooms-to-render-as-unread.patch
+++ b/patches/element-web/0011-Allow-muted-rooms-to-render-as-unread.patch
@@ -1,4 +1,4 @@
-From 1d65ea8a92786db6e8e168a15c59a321a1e2f287 Mon Sep 17 00:00:00 2001
+From 374b8e2560014595134b6fe9159744c3b8393a53 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Fri, 10 May 2024 18:58:32 +0200
 Subject: Allow muted rooms to render as unread
diff --git a/patches/element-web/0012-Increase-default-visible-tiles.patch b/patches/element-web/0012-Increase-default-visible-tiles.patch
index 215ce83..ded4733 100644
--- a/patches/element-web/0012-Increase-default-visible-tiles.patch
+++ b/patches/element-web/0012-Increase-default-visible-tiles.patch
@@ -1,4 +1,4 @@
-From 59c56762efba32f757c2b4de2434594d99494309 Mon Sep 17 00:00:00 2001
+From 2b71cfd3beb164cd15c9f67badce2bb4984536bc Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 30 Aug 2020 15:33:01 +0200
 Subject: Increase default visible tiles
diff --git a/patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch b/patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch
index 56d1f8d..d798f8a 100644
--- a/patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch
+++ b/patches/element-web/0013-Bring-back-showSpaceDMBadges-setting-force-enabled-f.patch
@@ -1,4 +1,4 @@
-From d9f613c500f9118a1c34fad44c1049127197c5b0 Mon Sep 17 00:00:00 2001
+From 7408ce839bd4d13cfff94671a0b5e06ac8825190 Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Sun, 26 May 2024 10:43:36 +0200
 Subject: Bring back showSpaceDMBadges setting, force-enabled for now
@@ -12,7 +12,7 @@ Co-authored-by: SpiritCroc <dev@spiritcroc.de>
  2 files changed, 30 insertions(+)
 
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index 5451a2b8d9..6ef6e3b276 100644
+index 3a9f107565..44a2ea90ce 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
 @@ -377,6 +377,11 @@ export const SETTINGS: Settings = {
@@ -28,7 +28,7 @@ index 5451a2b8d9..6ef6e3b276 100644
      "feature_video_rooms": {
          isFeature: true,
 diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
-index 2945d486c2..f004ce149f 100644
+index bfb98f6b02..fd38bd0010 100644
 --- a/src/stores/spaces/SpaceStore.ts
 +++ b/src/stores/spaces/SpaceStore.ts
 @@ -154,9 +154,17 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
@@ -71,7 +71,7 @@ index 2945d486c2..f004ce149f 100644
                      if (dmBadgeSpace && DMRoomMap.shared().getUserIdForRoomId(room.roomId)) {
                          return s === dmBadgeSpace;
                      }
-@@ -1311,6 +1327,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
+@@ -1312,6 +1328,15 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
                          break;
                      }
  
diff --git a/patches/element-web/0014-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch b/patches/element-web/0014-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch
index 28827a7..e41c927 100644
--- a/patches/element-web/0014-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch
+++ b/patches/element-web/0014-Squashed-Freeform-reactions-from-tadzik-freeform-rea.patch
@@ -1,4 +1,4 @@
-From ad6314cff53ecc8a7dd503905e45bec2cfd520bd Mon Sep 17 00:00:00 2001
+From cbf193f830fb03d7f949e72a6073226a164a1462 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Wed, 29 May 2024 19:32:42 +0200
 Subject: Squashed: Freeform reactions from tadzik/freeform-reactions-upstream
diff --git a/patches/element-web/0015-Allow-reactions-to-take-more-space.patch b/patches/element-web/0015-Allow-reactions-to-take-more-space.patch
index 613c694..3be4ad2 100644
--- a/patches/element-web/0015-Allow-reactions-to-take-more-space.patch
+++ b/patches/element-web/0015-Allow-reactions-to-take-more-space.patch
@@ -1,4 +1,4 @@
-From 66b9095781fb80ee982d0edc0263c8647c0e933d Mon Sep 17 00:00:00 2001
+From 96cad44b97108ad12f5f3d1fec364ff257d1e24d Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Sat, 22 Apr 2023 12:15:18 +0200
 Subject: Allow reactions to take more space
diff --git a/patches/element-web/0016-On-space-switch-don-t-automatically-show-last-opened.patch b/patches/element-web/0016-On-space-switch-don-t-automatically-show-last-opened.patch
index 7efb767..f707d9b 100644
--- a/patches/element-web/0016-On-space-switch-don-t-automatically-show-last-opened.patch
+++ b/patches/element-web/0016-On-space-switch-don-t-automatically-show-last-opened.patch
@@ -1,4 +1,4 @@
-From 18c070bf3095389634067a42eebb873d6d8709b8 Mon Sep 17 00:00:00 2001
+From e8052bf6d6fc81706fe9d84d613bb2496eab476e Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Thu, 30 May 2024 14:35:16 +0200
 Subject: On space switch don't automatically show last opened room
@@ -10,10 +10,10 @@ Subject: On space switch don't automatically show last opened room
  3 files changed, 24 insertions(+), 1 deletion(-)
 
 diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
-index 39c0147da0..77b9fa5444 100644
+index aef4fcdaf0..8f3e4a3d73 100644
 --- a/src/components/structures/MatrixChat.tsx
 +++ b/src/components/structures/MatrixChat.tsx
-@@ -1470,7 +1470,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
+@@ -1477,7 +1477,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
          if (this.screenAfterLogin && this.screenAfterLogin.screen) {
              this.showScreen(this.screenAfterLogin.screen, this.screenAfterLogin.params);
              this.screenAfterLogin = undefined;
@@ -30,7 +30,7 @@ index 39c0147da0..77b9fa5444 100644
              // Before defaulting to directory, show the last viewed room
              this.viewLastRoom();
          } else {
-@@ -1482,6 +1490,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
+@@ -1489,6 +1497,14 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
          }
      }
  
@@ -46,7 +46,7 @@ index 39c0147da0..77b9fa5444 100644
          dis.dispatch<ViewRoomPayload>({
              action: Action.ViewRoom,
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index 6ef6e3b276..fe81f165f0 100644
+index 44a2ea90ce..45acd909fb 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
 @@ -382,6 +382,12 @@ export const SETTINGS: Settings = {
@@ -63,7 +63,7 @@ index 6ef6e3b276..fe81f165f0 100644
      "feature_video_rooms": {
          isFeature: true,
 diff --git a/src/stores/spaces/SpaceStore.ts b/src/stores/spaces/SpaceStore.ts
-index f004ce149f..23b55c234f 100644
+index fd38bd0010..dcc99c4a94 100644
 --- a/src/stores/spaces/SpaceStore.ts
 +++ b/src/stores/spaces/SpaceStore.ts
 @@ -287,6 +287,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<EmptyObject> {
diff --git a/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch b/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch
index 12edd7f..8a53504 100644
--- a/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch
+++ b/patches/element-web/0017-Exclude-spaces-from-breadcrumbs.patch
@@ -1,4 +1,4 @@
-From 89a44556eb15999dd7a45ee88bc5fbb67f61f78b Mon Sep 17 00:00:00 2001
+From 8c438c147b0a53630794ef3399daee4b9a4bf860 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Tue, 9 Aug 2022 09:32:19 +0200
 Subject: Exclude spaces from breadcrumbs
@@ -8,7 +8,7 @@ Subject: Exclude spaces from breadcrumbs
  1 file changed, 1 insertion(+)
 
 diff --git a/src/stores/BreadcrumbsStore.ts b/src/stores/BreadcrumbsStore.ts
-index e3b01cae0b..02f6c286f2 100644
+index 041430340e..239b1915f6 100644
 --- a/src/stores/BreadcrumbsStore.ts
 +++ b/src/stores/BreadcrumbsStore.ts
 @@ -137,6 +137,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
diff --git a/patches/element-web/0018-Stop-the-search-bar-wobble.patch b/patches/element-web/0018-Stop-the-search-bar-wobble.patch
index 23ab50d..ca2d1d9 100644
--- a/patches/element-web/0018-Stop-the-search-bar-wobble.patch
+++ b/patches/element-web/0018-Stop-the-search-bar-wobble.patch
@@ -1,4 +1,4 @@
-From 3163f92f847c6bdccceb33691b4ec904af4eb373 Mon Sep 17 00:00:00 2001
+From 08919d9b0b2fd8cc9dfc036232cccc0c300d3337 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Mon, 19 Aug 2024 20:27:33 +0200
 Subject: Stop the search bar wobble
diff --git a/patches/element-web/0019-Import-SC-compound-theme-overrides.patch b/patches/element-web/0019-Import-SC-compound-theme-overrides.patch
index 0fae74e..4ddded7 100644
--- a/patches/element-web/0019-Import-SC-compound-theme-overrides.patch
+++ b/patches/element-web/0019-Import-SC-compound-theme-overrides.patch
@@ -1,4 +1,4 @@
-From ea69706386e838afa7a65a0c1658fc51fbac726c Mon Sep 17 00:00:00 2001
+From 62e0a5859768ec8cccefd3c3286d20fc7b3989e2 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 13 Oct 2024 11:23:54 +0200
 Subject: Import SC compound theme overrides
diff --git a/patches/element-web/0020-No-damn-avatar-background-in-room-list.patch b/patches/element-web/0020-No-damn-avatar-background-in-room-list.patch
index 3a6e5a0..b6420e0 100644
--- a/patches/element-web/0020-No-damn-avatar-background-in-room-list.patch
+++ b/patches/element-web/0020-No-damn-avatar-background-in-room-list.patch
@@ -1,4 +1,4 @@
-From 55f0270677cb390b32a82ee1050097118665b458 Mon Sep 17 00:00:00 2001
+From 1d219c553a67b500ff51039b7d43a9cea6017c0f Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Tue, 7 Sep 2021 19:41:52 +0200
 Subject: No damn avatar background in room list
diff --git a/patches/element-web/0021-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch b/patches/element-web/0021-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch
index efa0e03..a5b2f3f 100644
--- a/patches/element-web/0021-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch
+++ b/patches/element-web/0021-No-red-messages-in-1-1-chats-Close-SchildiChat-schil.patch
@@ -1,4 +1,4 @@
-From 3e41f5effcdebe7e5a451dcff076102c459e3b01 Mon Sep 17 00:00:00 2001
+From 2739cd04d2943a900b7b6e2d82d0119da57078fb Mon Sep 17 00:00:00 2001
 From: su-ex <codeworks@supercable.onl>
 Date: Tue, 22 Dec 2020 19:16:28 +0100
 Subject: No red messages in 1:1 chats Close SchildiChat/schildichat-desktop#13
diff --git a/patches/element-web/0022-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch b/patches/element-web/0022-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch
index bf2a1d5..95ce282 100644
--- a/patches/element-web/0022-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch
+++ b/patches/element-web/0022-Always-apply-corner-radius-to-all-edges-of-the-bubbl.patch
@@ -1,4 +1,4 @@
-From 21537c177ddff95201ae0e448c0e43ef4602b3c7 Mon Sep 17 00:00:00 2001
+From d402180b5de9d726665a19849ba3852400d6e2a8 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 13 Oct 2024 13:26:16 +0200
 Subject: Always apply corner radius to all edges of the bubble
diff --git a/patches/element-web/0023-Always-show-timestamps-by-default.patch b/patches/element-web/0023-Always-show-timestamps-by-default.patch
index d38d609..ea14304 100644
--- a/patches/element-web/0023-Always-show-timestamps-by-default.patch
+++ b/patches/element-web/0023-Always-show-timestamps-by-default.patch
@@ -1,4 +1,4 @@
-From 7794aa78c55e439726ac7ddc27d26c7ea2d7b749 Mon Sep 17 00:00:00 2001
+From 6e5087cfb3eb77ed1970c179c9bc9a9bd4e7ef78 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 13 Oct 2024 13:53:07 +0200
 Subject: Always show timestamps by default
@@ -8,7 +8,7 @@ Subject: Always show timestamps by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index fe81f165f0..821c13febd 100644
+index 45acd909fb..bb63279adc 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
 @@ -846,7 +846,7 @@ export const SETTINGS: Settings = {
diff --git a/patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch b/patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch
index 7834433..fdcef52 100644
--- a/patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch
+++ b/patches/element-web/0024-Enable-custom-emote-rendering-by-default.patch
@@ -1,4 +1,4 @@
-From e21f027e16c8665abf3efcd5d0aa69625aad1f50 Mon Sep 17 00:00:00 2001
+From d7e9e6b3cee0a4b041674e5818d4a215065f2849 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Thu, 17 Oct 2024 19:40:51 +0200
 Subject: Enable custom emote rendering by default
@@ -8,7 +8,7 @@ Subject: Enable custom emote rendering by default
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index 821c13febd..ab8c1c2919 100644
+index bb63279adc..ff94d6da5a 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
 @@ -701,7 +701,7 @@ export const SETTINGS: Settings = {
diff --git a/patches/element-web/0025-Enable-chat-previews-by-default.patch b/patches/element-web/0025-Enable-chat-previews-by-default.patch
index 1358a44..f8362a7 100644
--- a/patches/element-web/0025-Enable-chat-previews-by-default.patch
+++ b/patches/element-web/0025-Enable-chat-previews-by-default.patch
@@ -1,4 +1,4 @@
-From 6292a53f4e500c6a98c086f6f13709349461999a Mon Sep 17 00:00:00 2001
+From 1663a5f4bf95c858603ee929ad9e7d7b9eeb26ea Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sun, 27 Oct 2024 19:24:26 +0100
 Subject: Enable chat previews by default
diff --git a/patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch b/patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch
index c582965..4800f26 100644
--- a/patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch
+++ b/patches/element-web/0026-Disable-showing-people-in-spaces-by-default.patch
@@ -1,4 +1,4 @@
-From f415814b6e1bf7db90758632c690d62a74b28acf Mon Sep 17 00:00:00 2001
+From 1b7806086868b9f20769143cdf6dd7f412e97642 Mon Sep 17 00:00:00 2001
 From: SpiritCroc <dev@spiritcroc.de>
 Date: Sat, 30 Nov 2024 19:42:44 +0100
 Subject: Disable showing people in spaces by default
@@ -9,7 +9,7 @@ Subject: Disable showing people in spaces by default
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
-index ab8c1c2919..49b20b2c0a 100644
+index ff94d6da5a..06c3d66f74 100644
 --- a/src/settings/Settings.tsx
 +++ b/src/settings/Settings.tsx
 @@ -1298,7 +1298,7 @@ export const SETTINGS: Settings = {
diff --git a/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch b/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch
index 3003c1d..2385788 100644
--- a/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch
+++ b/patches/element-web/0027-Improve-IRC-layout-for-SchildiChat.patch
@@ -1,4 +1,4 @@
-From ad702a9f6924ff0942a537effa5c711c1724255b Mon Sep 17 00:00:00 2001
+From b47fb62f1d7459cabbe5419266748a003eb71dc5 Mon Sep 17 00:00:00 2001
 From: Suguru Hirahara <luixxiul@users.noreply.github.com>
 Date: Thu, 31 Oct 2024 13:44:20 -0400
 Subject: Improve IRC layout for SchildiChat