diff --git a/src/org/yaaic/model/Message.java b/src/org/yaaic/model/Message.java
index c5b7a3a..ff96b6a 100644
--- a/src/org/yaaic/model/Message.java
+++ b/src/org/yaaic/model/Message.java
@@ -157,6 +157,9 @@ public class Message {
 
 		if (!use24hFormat) {
 			hours = Math.abs(24 - hours);
+			if (hours == 24) {
+				hours = 0;
+			}
 		}
 		
 		return "[" + (hours < 10 ? "0" + hours : hours) + ":" + (minutes < 10 ? "0" + minutes : minutes) + "] ";