diff --git a/lib/screens/channel_chat_screen.dart b/lib/screens/channel_chat_screen.dart
index 9393a27a..4f7805bc 100644
--- a/lib/screens/channel_chat_screen.dart
+++ b/lib/screens/channel_chat_screen.dart
@@ -347,8 +347,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                             }
                             final isUnreadAnchor =
                                 _unreadDividerMessageId != null &&
-                                    message.messageId ==
-                                        _unreadDividerMessageId;
+                                message.messageId == _unreadDividerMessageId;
                             return Container(
                               key: _messageKeys[message.messageId]!,
                               child: Builder(
@@ -364,10 +363,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                                   if (isUnreadAnchor) {
                                     return Column(
                                       mainAxisSize: MainAxisSize.min,
-                                      children: [
-                                        const UnreadDivider(),
-                                        bubble,
-                                      ],
+                                      children: [const UnreadDivider(), bubble],
                                     );
                                   }
                                   return bubble;
diff --git a/lib/screens/chat_screen.dart b/lib/screens/chat_screen.dart
index 62268f03..3e49b819 100644
--- a/lib/screens/chat_screen.dart
+++ b/lib/screens/chat_screen.dart
@@ -514,7 +514,8 @@ class _ChatScreenState extends State<ChatScreen> {
                 onRetryReaction: (msg, emoji) =>
                     _sendReaction(msg, contact, emoji),
               );
-              final isUnreadAnchor = _unreadDividerMessageId != null &&
+              final isUnreadAnchor =
+                  _unreadDividerMessageId != null &&
                   message.messageId == _unreadDividerMessageId;
               final child = isUnreadAnchor
                   ? Column(
@@ -1354,16 +1355,13 @@ class _ChatScreenState extends State<ChatScreen> {
 
   void _openChat(BuildContext context, Contact contact) {
     final connector = context.read<MeshCoreConnector>();
-    final unread =
-        connector.getUnreadCountForContactKey(contact.publicKeyHex);
+    final unread = connector.getUnreadCountForContactKey(contact.publicKeyHex);
     connector.markContactRead(contact.publicKeyHex);
     Navigator.push(
       context,
       MaterialPageRoute(
-        builder: (context) => ChatScreen(
-          contact: contact,
-          initialUnreadCount: unread,
-        ),
+        builder: (context) =>
+            ChatScreen(contact: contact, initialUnreadCount: unread),
       ),
     );
   }
diff --git a/lib/screens/map_screen.dart b/lib/screens/map_screen.dart
index 39d42a49..0997e214 100644
--- a/lib/screens/map_screen.dart
+++ b/lib/screens/map_screen.dart
@@ -1392,16 +1392,15 @@ class _MapScreenState extends State<MapScreen> {
         // onLogin(password, isAdmin) isAdmin not used for room caht screen
         onLogin: (password, _) {
           final connector = context.read<MeshCoreConnector>();
-          final unread =
-              connector.getUnreadCountForContactKey(room.publicKeyHex);
+          final unread = connector.getUnreadCountForContactKey(
+            room.publicKeyHex,
+          );
           connector.markContactRead(room.publicKeyHex);
           Navigator.push(
             context,
             MaterialPageRoute(
-              builder: (context) => ChatScreen(
-                contact: room,
-                initialUnreadCount: unread,
-              ),
+              builder: (context) =>
+                  ChatScreen(contact: room, initialUnreadCount: unread),
             ),
           );
         },
@@ -1463,8 +1462,9 @@ class _MapScreenState extends State<MapScreen> {
                 if (!contact.isActive) {
                   connector.importDiscoveredContact(contact);
                 }
-                final unread =
-                    connector.getUnreadCountForContactKey(contact.publicKeyHex);
+                final unread = connector.getUnreadCountForContactKey(
+                  contact.publicKeyHex,
+                );
                 Navigator.pop(dialogContext);
                 Navigator.push(
                   context,