diff --git a/lib/controllers/client.dart b/lib/controllers/client.dart
index 5e01ca6..7d9604b 100644
--- a/lib/controllers/client.dart
+++ b/lib/controllers/client.dart
@@ -25,7 +25,6 @@ import "package:nexus/models/requests/get_event_context.dart";
 import "package:nexus/models/requests/get_mentions.dart";
 import "package:nexus/models/requests/get_related_events.dart";
 import "package:nexus/models/requests/get_room_state.dart";
-import "package:nexus/models/requests/get_room_summary.dart";
 import "package:nexus/models/requests/join_room.dart";
 import "package:nexus/models/profile_response.dart";
 import "package:nexus/models/requests/oauth/exchange_token.dart";
@@ -189,7 +188,7 @@ class ClientController extends AsyncNotifier<int> {
   Future<String> joinRoom(JoinRoomRequest request) async =>
       (await _sendCommand("join_room", request.toJson()))["room_id"];
 
-  Future<RoomSummary> getRoomSummary(GetRoomSummary request) async =>
+  Future<RoomSummary> getRoomSummary(JoinRoomRequest request) async =>
       .fromJson(await _sendCommand("get_room_summary", request.toJson()));
 
   Future<void> leaveRoom(Room room) async {
diff --git a/lib/controllers/invited_rooms.dart b/lib/controllers/invited_rooms.dart
deleted file mode 100644
index 94ce9b5..0000000
--- a/lib/controllers/invited_rooms.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-import "package:fast_immutable_collections/fast_immutable_collections.dart";
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/models/invited_room.dart";
-
-class InvitedRoomsController extends Notifier<IList<InvitedRoom>> {
-  @override
-  IList<InvitedRoom> build() => .new();
-
-  void set(IList<InvitedRoom> newState) => state = newState;
-
-  static final provider =
-      NotifierProvider<InvitedRoomsController, IList<InvitedRoom>>(
-        InvitedRoomsController.new,
-      );
-}
diff --git a/lib/controllers/room_summary.dart b/lib/controllers/room_summary.dart
index 05f555d..e5b3174 100644
--- a/lib/controllers/room_summary.dart
+++ b/lib/controllers/room_summary.dart
@@ -1,16 +1,16 @@
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:nexus/controllers/client.dart";
-import "package:nexus/models/requests/get_room_summary.dart";
+import "package:nexus/models/requests/join_room.dart";
 import "package:nexus/models/room_summary.dart";
 
-class RoomSummaryController(final GetRoomSummary request)
+class RoomSummaryController(final JoinRoomRequest request)
     extends AsyncNotifier<RoomSummary> {
   @override
   Future<RoomSummary> build() =>
       ref.read(ClientController.provider.notifier).getRoomSummary(request);
 
   static final provider = AsyncNotifierProvider.family
-      .autoDispose<RoomSummaryController, RoomSummary, GetRoomSummary>(
+      .autoDispose<RoomSummaryController, RoomSummary, JoinRoomRequest>(
         RoomSummaryController.new,
       );
 }
diff --git a/lib/models/invited_room.dart b/lib/models/invited_room.dart
deleted file mode 100644
index 1393f3f..0000000
--- a/lib/models/invited_room.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-import "package:fast_immutable_collections/fast_immutable_collections.dart";
-import "package:freezed_annotation/freezed_annotation.dart";
-import "package:nexus/models/epoch_date_time_converter.dart";
-import "package:nexus/models/event.dart";
-
-part "invited_room.freezed.dart";
-part "invited_room.g.dart";
-
-@Freezed(toJson: false, fromJson: false)
-@JsonSerializable()
-class const InvitedRoom({
-  required final String roomId,
-  @EpochDateTimeConverter() required final DateTime createdAt,
-  // TODO: This is DBEvent, should be event.Event
-  required final IList<Event> inviteState,
-}) with _$InvitedRoom {
-  Map<String, Object?> toJson() => _$InvitedRoomToJson(this);
-
-  factory InvitedRoom.fromJson(Map<String, Object?> json) =>
-      _$InvitedRoomFromJson(json);
-}
diff --git a/lib/models/requests/get_room_summary.dart b/lib/models/requests/get_room_summary.dart
deleted file mode 100644
index ba94ad2..0000000
--- a/lib/models/requests/get_room_summary.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-import "package:fast_immutable_collections/fast_immutable_collections.dart";
-import "package:freezed_annotation/freezed_annotation.dart";
-
-part "get_room_summary.freezed.dart";
-part "get_room_summary.g.dart";
-
-@Freezed(toJson: false, fromJson: false)
-@JsonSerializable()
-class const GetRoomSummary({
-  required final String roomIdOrAlias,
-  final IList<String> via = const IList.empty(),
-}) with _$GetRoomSummary {
-  Map<String, Object?> toJson() => _$GetRoomSummaryToJson(this);
-
-  factory GetRoomSummary.fromJson(Map<String, Object?> json) =>
-      _$GetRoomSummaryFromJson(json);
-}
diff --git a/lib/models/requests/join_room.dart b/lib/models/requests/join_room.dart
index 17c1d0a..350b762 100644
--- a/lib/models/requests/join_room.dart
+++ b/lib/models/requests/join_room.dart
@@ -9,7 +9,6 @@ part "join_room.g.dart";
 class const JoinRoomRequest({
   required final String roomIdOrAlias,
   final IList<String> via = const IList.empty(),
-  final bool fromInvite = false,
 }) with _$JoinRoomRequest {
   Map<String, Object?> toJson() => _$JoinRoomRequestToJson(this);
 
diff --git a/lib/models/sync_data.dart b/lib/models/sync_data.dart
index 26c8451..a9c10bf 100644
--- a/lib/models/sync_data.dart
+++ b/lib/models/sync_data.dart
@@ -1,6 +1,5 @@
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
 import "package:freezed_annotation/freezed_annotation.dart";
-import "package:nexus/models/invited_room.dart";
 import "package:nexus/models/room.dart";
 import "package:nexus/models/space_edge.dart";
 
@@ -13,7 +12,6 @@ class const SyncData({
   final bool clearState = false,
   final IMap<String, IMap<String, dynamic>> accountData = const IMap.empty(),
   final IMap<String, Room> rooms = const IMap.empty(),
-  final IList<InvitedRoom> invitedRooms = const IList.empty(),
   final ISet<String> leftRooms = const ISet.empty(),
   final IMap<String, IList<SpaceEdge>>? spaceEdges,
   final IList<String>? topLevelSpaces,
diff --git a/lib/widgets/renderers/generic_event.dart b/lib/widgets/renderers/generic_event.dart
index c5aef0b..5ff9dbc 100644
--- a/lib/widgets/renderers/generic_event.dart
+++ b/lib/widgets/renderers/generic_event.dart
@@ -24,7 +24,7 @@ class const GenericEventRenderer(
                 ],
               ],
             ),
-            maxLines: maxLines ?? 9007199254740991,
+            maxLines: maxLines ?? 999,
             overflow: .ellipsis,
           ),
         ),
diff --git a/lib/widgets/renderers/message.dart b/lib/widgets/renderers/message.dart
index fa8dcb5..3404bc5 100644
--- a/lib/widgets/renderers/message.dart
+++ b/lib/widgets/renderers/message.dart
@@ -38,7 +38,9 @@ class const MessageRenderer(
     final errorStyle = TextStyle(color: colorScheme.error);
 
     final textStyle = TextStyle(
-      fontSize: event.localContent?.bigEmoji == true ? 32 : null,
+      fontSize: event.localContent?.bigEmoji == true && maxLines != 1
+          ? 32
+          : null,
       fontStyle: event.content is EmoteMessageContent ? .italic : null,
     );