diff --git a/packages/stream_chat_flutter/lib/src/channel_preview.dart b/packages/stream_chat_flutter/lib/src/channel_preview.dart
index 9ba34f3a..3243988b 100644
--- a/packages/stream_chat_flutter/lib/src/channel_preview.dart
+++ b/packages/stream_chat_flutter/lib/src/channel_preview.dart
@@ -170,14 +170,14 @@ class ChannelPreview extends StatelessWidget {
 
         if (lastMessageAt.millisecondsSinceEpoch >=
             startOfDay.millisecondsSinceEpoch) {
-          stringDate = Jiffy(lastMessageAt.toLocal()).format('HH:mm');
+          stringDate = Jiffy(lastMessageAt.toLocal()).jm;
         } else if (lastMessageAt.millisecondsSinceEpoch >=
             startOfDay.subtract(Duration(days: 1)).millisecondsSinceEpoch) {
           stringDate = 'Yesterday';
         } else if (startOfDay.difference(lastMessageAt).inDays < 7) {
           stringDate = Jiffy(lastMessageAt.toLocal()).EEEE;
         } else {
-          stringDate = Jiffy(lastMessageAt.toLocal()).format('dd/MM/yyyy');
+          stringDate = Jiffy(lastMessageAt.toLocal()).yMd;
         }
 
         return Text(
diff --git a/packages/stream_chat_flutter/lib/src/date_divider.dart b/packages/stream_chat_flutter/lib/src/date_divider.dart
index c7cfe296..20b8151d 100644
--- a/packages/stream_chat_flutter/lib/src/date_divider.dart
+++ b/packages/stream_chat_flutter/lib/src/date_divider.dart
@@ -28,14 +28,14 @@ class DateDivider extends StatelessWidget {
       now.subtract(Duration(days: 7)),
       Units.DAY,
     )) {
-      dayInfo = createdAt.format('EEEE');
+      dayInfo = createdAt.EEEE;
     } else if (Jiffy(createdAt).isAfter(
       Jiffy(now).subtract(years: 1),
       Units.DAY,
     )) {
-      dayInfo = createdAt.format('MMMM d');
+      dayInfo = createdAt.MMMd;
     } else {
-      dayInfo = createdAt.format('MMMM d');
+      dayInfo = createdAt.MMMd;
     }
 
     if (uppercase) dayInfo = dayInfo.toUpperCase();
diff --git a/packages/stream_chat_flutter/lib/src/full_screen_media.dart b/packages/stream_chat_flutter/lib/src/full_screen_media.dart
index 88c20a51..91c66ca4 100644
--- a/packages/stream_chat_flutter/lib/src/full_screen_media.dart
+++ b/packages/stream_chat_flutter/lib/src/full_screen_media.dart
@@ -220,7 +220,7 @@ class _FullScreenMediaState extends State<FullScreenMedia>
         24) {
       return 'yesterday';
     } else {
-      return 'on ${Jiffy(dateTime).format("MMM do")}';
+      return 'on ${Jiffy(dateTime).MMMd}';
     }
   }
 
diff --git a/packages/stream_chat_flutter/lib/src/message_search_item.dart b/packages/stream_chat_flutter/lib/src/message_search_item.dart
index 335f7ff4..4cf7b5ed 100644
--- a/packages/stream_chat_flutter/lib/src/message_search_item.dart
+++ b/packages/stream_chat_flutter/lib/src/message_search_item.dart
@@ -84,9 +84,9 @@ class MessageSearchItem extends StatelessWidget {
     if (now.year != createdAt.year ||
         now.month != createdAt.month ||
         now.day != createdAt.day) {
-      stringDate = Jiffy(createdAt.toLocal()).format('dd/MM/yyyy');
+      stringDate = Jiffy(createdAt.toLocal()).yMd;
     } else {
-      stringDate = Jiffy(createdAt.toLocal()).format('HH:mm');
+      stringDate = Jiffy(createdAt.toLocal()).jm;
     }
 
     return Text(
diff --git a/packages/stream_chat_flutter/lib/src/stream_chat.dart b/packages/stream_chat_flutter/lib/src/stream_chat.dart
index 66b49d88..470591e7 100644
--- a/packages/stream_chat_flutter/lib/src/stream_chat.dart
+++ b/packages/stream_chat_flutter/lib/src/stream_chat.dart
@@ -3,9 +3,11 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_portal/flutter_portal.dart';
+import 'package:jiffy/jiffy.dart';
 import 'package:stream_chat_flutter/src/stream_chat_theme.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart';
+import 'dart:ui' as ui;
 
 /// Widget used to provide information about the chat to the widget tree
 ///
@@ -121,4 +123,11 @@ class StreamChatState extends State<StreamChat> {
   void initState() {
     super.initState();
   }
+
+  @override
+  void didChangeDependencies() {
+    final locale = ui.window.locale;
+    Jiffy.locale(locale.languageCode);
+    super.didChangeDependencies();
+  }
 }
diff --git a/packages/stream_chat_flutter/test/src/channel_preview_test.dart b/packages/stream_chat_flutter/test/src/channel_preview_test.dart
index 34b9bf92..094c74a5 100644
--- a/packages/stream_chat_flutter/test/src/channel_preview_test.dart
+++ b/packages/stream_chat_flutter/test/src/channel_preview_test.dart
@@ -69,7 +69,7 @@ void main() {
         ),
       ));
 
-      expect(find.text('22/06/2020'), findsOneWidget);
+      expect(find.text('6/22/2020'), findsOneWidget);
       expect(find.text('test name'), findsOneWidget);
       expect(find.text('1'), findsOneWidget);
       expect(find.text('hello'), findsOneWidget);