diff --git a/flutter/TODO.md b/flutter/TODO.md
index 5ebef84..1583bd6 100644
--- a/flutter/TODO.md
+++ b/flutter/TODO.md
@@ -25,7 +25,7 @@
 
  - [ ] Still @ERROR on scn-init, but no logs? - better persist error (write in SharedPrefs at error_$date=txt ?), also perhaps print first error line in scn-init notification?
 
- - [ ] fix time format (in message-list, in card, top right) - midnight is shown as "24:05" instead of "00:05" - thats weird
+ - [x] fix time format (in message-list, in card, top right) - midnight is shown as "24:05" instead of "00:05" - thats weird
 
  - [ ] Add scrollbar
        -> https://api.flutter.dev/flutter/material/Scrollbar-class.html
diff --git a/flutter/lib/pages/channel_list/channel_list_item.dart b/flutter/lib/pages/channel_list/channel_list_item.dart
index 61a10fb..b43fb34 100644
--- a/flutter/lib/pages/channel_list/channel_list_item.dart
+++ b/flutter/lib/pages/channel_list/channel_list_item.dart
@@ -20,7 +20,7 @@ enum ChannelListItemMode {
 }
 
 class ChannelListItem extends StatefulWidget {
-  static final _dateFormat = DateFormat('yyyy-MM-dd kk:mm');
+  static final _dateFormat = DateFormat('yyyy-MM-dd HH:mm'); //TODO setting
 
   const ChannelListItem({
     required this.channel,
diff --git a/flutter/lib/pages/debug/debug_logs.dart b/flutter/lib/pages/debug/debug_logs.dart
index be8f5d2..17ffec8 100644
--- a/flutter/lib/pages/debug/debug_logs.dart
+++ b/flutter/lib/pages/debug/debug_logs.dart
@@ -11,7 +11,7 @@ class DebugLogsPage extends StatefulWidget {
 class _DebugLogsPageState extends State<DebugLogsPage> {
   Box<SCNLog> logBox = Hive.box<SCNLog>('scn-logs');
 
-  static final _dateFormat = DateFormat('yyyy-MM-dd kk:mm');
+  static final _dateFormat = DateFormat('yyyy-MM-dd HH:mm'); //TODO setting
 
   @override
   Widget build(BuildContext context) {
diff --git a/flutter/lib/pages/debug/debug_requests.dart b/flutter/lib/pages/debug/debug_requests.dart
index c0b2bc5..91d2c0e 100644
--- a/flutter/lib/pages/debug/debug_requests.dart
+++ b/flutter/lib/pages/debug/debug_requests.dart
@@ -13,7 +13,7 @@ class DebugRequestsPage extends StatefulWidget {
 class _DebugRequestsPageState extends State<DebugRequestsPage> {
   Box<SCNRequest> requestsBox = Hive.box<SCNRequest>('scn-requests');
 
-  static final _dateFormat = DateFormat('yyyy-MM-dd kk:mm');
+  static final _dateFormat = DateFormat('yyyy-MM-dd HH:mm'); //TODO setting
 
   @override
   Widget build(BuildContext context) {
diff --git a/flutter/lib/pages/message_list/message_list_item.dart b/flutter/lib/pages/message_list/message_list_item.dart
index 635c129..0725f95 100644
--- a/flutter/lib/pages/message_list/message_list_item.dart
+++ b/flutter/lib/pages/message_list/message_list_item.dart
@@ -8,7 +8,7 @@ import 'package:intl/intl.dart';
 import 'package:simplecloudnotifier/utils/ui.dart';
 
 class MessageListItem extends StatelessWidget {
-  static final _dateFormat = DateFormat('yyyy-MM-dd kk:mm');
+  static final _dateFormat = DateFormat('yyyy-MM-dd HH:mm'); //TODO setting
   static final _lineCount = 3; //TODO setting
 
   const MessageListItem({
diff --git a/flutter/lib/pages/message_view/message_view.dart b/flutter/lib/pages/message_view/message_view.dart
index 0fdf559..efe840a 100644
--- a/flutter/lib/pages/message_view/message_view.dart
+++ b/flutter/lib/pages/message_view/message_view.dart
@@ -34,7 +34,7 @@ class MessageViewPage extends StatefulWidget {
 class _MessageViewPageState extends State<MessageViewPage> {
   late Future<(SCNMessage, ChannelPreview, KeyTokenPreview, UserPreview)>? mainFuture;
   (SCNMessage, ChannelPreview, KeyTokenPreview, UserPreview)? mainFutureSnapshot = null;
-  static final _dateFormat = DateFormat('yyyy-MM-dd kk:mm');
+  static final _dateFormat = DateFormat('yyyy-MM-dd HH:mm'); //TODO setting
 
   bool _monospaceMode = false;