diff --git a/lib/controllers/room_chat_controller.dart b/lib/controllers/room_chat_controller.dart
index a750e53..2b6810b 100644
--- a/lib/controllers/room_chat_controller.dart
+++ b/lib/controllers/room_chat_controller.dart
@@ -6,7 +6,6 @@ import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:fluttertagger/fluttertagger.dart";
 import "package:nexus/controllers/client_controller.dart";
 import "package:nexus/controllers/rooms_controller.dart";
-import "package:nexus/models/content/message.dart";
 import "package:nexus/models/content/reaction.dart";
 import "package:nexus/models/event.dart";
 import "package:nexus/models/requests/get_related_events_request.dart";
@@ -38,14 +37,8 @@ class RoomChatController extends AsyncNotifier<IList<Event>> {
       await ref.read(RoomsController.provider.notifier).addState(roomId, state);
     }
 
-    // While there are under 5 messages or under 20 events, try to load
-    // more messages until there's no more or the conditions are met.
-    if (room.hasMore &&
-        (room.events.values
-                    .where((event) => event.content is MessageContent)
-                    .length <
-                5 ||
-            room.timeline.length < 20)) {
+    // While there are under 30 messages, try up to load more messages until there's no more or we have 20 messages.
+    if (room.hasMore && room.timeline.length < 30) {
       loadOlder();
     }
 
diff --git a/lib/pages/verify_page.dart b/lib/pages/verify_page.dart
index 387c640..962701c 100644
--- a/lib/pages/verify_page.dart
+++ b/lib/pages/verify_page.dart
@@ -21,7 +21,7 @@ class VerifyPage extends HookConsumerWidget {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Text(
-              "Enter your recovery key or passphrase below to unlock encrypted events.\nYour passphrase is usually not the same as your password.",
+              "Enter your recovery key or passphrase below to unlock encrypted messages.\nYour passphrase is usually not the same as your password.",
             ),
             SizedBox(height: 12),
             FormTextInput(