diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index da34671cc..5154ce4aa 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -3374,5 +3374,6 @@
   "moreEvents": "More events",
   "@moreEvents": {},
   "declineInvitation": "Decline invitation",
-  "@declineInvitation": {}
+  "@declineInvitation": {},
+  "noMessagesYet": "No messages yet"
 }
diff --git a/lib/l10n/intl_pt_BR.arb b/lib/l10n/intl_pt_BR.arb
index 69b1d49d4..2a37ab519 100644
--- a/lib/l10n/intl_pt_BR.arb
+++ b/lib/l10n/intl_pt_BR.arb
@@ -82,7 +82,7 @@
         "type": "String",
         "placeholders": {}
     },
-    "areGuestsAllowedToJoin": "Visitantes podem entrar?",
+    "areGuestsAllowedToJoin": "Visitantes podem entrar",
     "@areGuestsAllowedToJoin": {
         "type": "String",
         "placeholders": {}
@@ -3296,7 +3296,7 @@
     "@boldText": {},
     "recordAVideo": "Gravar um vídeo",
     "@recordAVideo": {},
-    "optionalMessage": "Mensagem... (opcional)",
+    "optionalMessage": "(Opcional) mensagem...",
     "@optionalMessage": {},
     "joinedChats": "Conversas que entrou",
     "@joinedChats": {},
diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart
index 639ccd5b4..52f1be868 100644
--- a/lib/pages/chat_list/chat_list_item.dart
+++ b/lib/pages/chat_list/chat_list_item.dart
@@ -202,13 +202,12 @@ class ChatListItem extends StatelessWidget {
                         color: theme.colorScheme.primary,
                       ),
                     ),
-                  if (!room.isSpace &&
-                      lastEvent != null &&
-                      room.membership != Membership.invite)
+                  if (!room.isSpace && room.membership != Membership.invite)
                     Padding(
                       padding: const EdgeInsets.only(left: 4.0),
                       child: Text(
-                        lastEvent.originServerTs.localizedTimeShort(context),
+                        room.latestEventReceivedTime
+                            .localizedTimeShort(context),
                         style: TextStyle(
                           fontSize: 12,
                           color: theme.colorScheme.outline,
@@ -303,7 +302,7 @@ class ChatListItem extends StatelessWidget {
                                               : L10n.of(context)
                                                   .inviteGroupChat)
                                       : snapshot.data ??
-                                          L10n.of(context).emptyChat,
+                                          L10n.of(context).noMessagesYet,
                                   softWrap: false,
                                   maxLines: room.notificationCount >= 1 ? 2 : 1,
                                   overflow: TextOverflow.ellipsis,
diff --git a/pubspec.lock b/pubspec.lock
index eaed7e693..f0b828eef 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -413,10 +413,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_selector
-      sha256: "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828"
+      sha256: "5f1d15a7f17115038f433d1b0ea57513cc9e29a9d5338d166cb0bef3fa90a7a0"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   file_selector_android:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index e75ddcbbb..fa25f38c7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -25,7 +25,7 @@ dependencies:
   emoji_picker_flutter: ^4.3.0
   emojis: ^0.9.9
   file_picker: ^10.3.3
-  file_selector: ^1.0.3
+  file_selector: ^1.0.4
   flutter:
     sdk: flutter
   flutter_foreground_task: ^9.1.0