diff --git a/lib/provider/chat_provider.dart b/lib/provider/chat_provider.dart
index 8067cd9..7a67e9b 100644
--- a/lib/provider/chat_provider.dart
+++ b/lib/provider/chat_provider.dart
@@ -51,7 +51,7 @@ class ChatProvider extends ChangeNotifier {
   UnmodifiableListView<MapEntry<User, Message>> getLastMessageOfEachUser() {
     final result =
         _messages.entries.where((element) => element.value.isNotEmpty).map((e) {
-      MapEntry<User, Message> entry = MapEntry(e.key, e.value.last);
+      MapEntry<User, Message> entry = MapEntry(e.key, e.value.first);
       return entry;
     }).toList();
     return UnmodifiableListView(result);
diff --git a/lib/widgets/custom_list.dart b/lib/widgets/custom_list.dart
index 642724b..a830fdc 100644
--- a/lib/widgets/custom_list.dart
+++ b/lib/widgets/custom_list.dart
@@ -19,7 +19,7 @@ class CustomList extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    DateFormat format = DateFormat('d/m/yy');
+    DateFormat format = DateFormat('d/MM/yy');
     return Column(
       children: [
         StraightTopBar(title: _title),