diff --git a/src/main/java/envoy/client/data/Chat.java b/src/main/java/envoy/client/data/Chat.java
index 51c2b1b..1eeed6a 100644
--- a/src/main/java/envoy/client/data/Chat.java
+++ b/src/main/java/envoy/client/data/Chat.java
@@ -101,12 +101,12 @@ public final class Chat implements Serializable {
 	 * @since Envoy Client v0.1-beta
 	 */
 	public void insert(Message message) {
-		if (messages.isEmpty()) messages.add(message);
-		else for (int i = messages.size() - 1; i >= 0; --i)
+		for (int i = messages.size() - 1; i >= 0; --i)
 			if (message.getCreationDate().isAfter(messages.get(i).getCreationDate())) {
 				messages.add(i + 1, message);
-				break;
+				return;
 			}
+		messages.add(0, message);
 	}
 
 	/**