diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1a6a7397..83968b329 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## v1.21.1
+- build: Update Matrix Dart SDK (Krille)
+- build: Update to Flutter 3.22.2 (krille-chan)
+- feat: add option to configure reply swipe direction (MrSpoony)
+- fix: Add missing unlock button to lockscreen textfield (Krille)
+- fix: Auto unlock lock screen (krille-chan)
+- Translated using Weblate (Chinese (Simplified)) (大王叫我来巡山)
+- Translated using Weblate (Estonian) (Priit Jõerüüt)
+- Translated using Weblate (Estonian) (Rauno Ots)
+- Translated using Weblate (Galician) (josé m)
+- Translated using Weblate (Turkish) (Oğuz Ersen)
+- Translated using Weblate (Vietnamese) (Karo)
+
 ## v1.21.0
 FluffyChat v1.21.0 introduces the new search feature which also includes a gallery and files list for each chat. Several performance improvements have been added under the hood, leading to a much nicer user experience.
 
diff --git a/lib/widgets/lock_screen.dart b/lib/widgets/lock_screen.dart
index 17f4bef52..b756a3954 100644
--- a/lib/widgets/lock_screen.dart
+++ b/lib/widgets/lock_screen.dart
@@ -100,6 +100,10 @@ class _LockScreenState extends State<LockScreen> {
                   decoration: InputDecoration(
                     errorText: _errorText,
                     hintText: '****',
+                    suffix: IconButton(
+                      icon: const Icon(Icons.lock_open_outlined),
+                      onPressed: () => tryUnlock(_textEditingController.text),
+                    ),
                   ),
                 ),
                 if (_inputBlocked)
diff --git a/pubspec.lock b/pubspec.lock
index f9da302e6..afe372a2f 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1409,10 +1409,10 @@ packages:
     dependency: "direct main"
     description:
       name: matrix
-      sha256: "668ed9b7279ac9c364c687585e606c1122f88d6e2e3410ba781a167b47cd9471"
+      sha256: bb6de59d0f69e10bb6893130a967f1ffcbfa3d3ffed3864f0736ce3d968e669c
       url: "https://pub.dev"
     source: hosted
-    version: "0.29.9"
+    version: "0.29.12"
   meta:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index aa6dbff32..bf5fc3b2d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -6,7 +6,7 @@ description: Learn a language while texting your friends.
 # Pangea#
 publish_to: none
 # On version bump also increase the build number for F-Droid
-version: 1.21.0+3533
+version: 1.21.1+3533
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
@@ -70,7 +70,7 @@ dependencies:
   keyboard_shortcuts: ^0.1.4
   latlong2: ^0.9.1
   linkify: ^5.0.0
-  matrix: ^0.29.9
+  matrix: ^0.29.12
   native_imaging: ^0.1.1
   package_info_plus: ^6.0.0
   pasteboard: ^0.2.0