diff --git a/src/main/java/envoy/server/data/GroupMessage.java b/src/main/java/envoy/server/data/GroupMessage.java
index 9f9a72a..7c61390 100644
--- a/src/main/java/envoy/server/data/GroupMessage.java
+++ b/src/main/java/envoy/server/data/GroupMessage.java
@@ -71,7 +71,7 @@ public class GroupMessage extends Message {
 	@Override
 	public envoy.data.GroupMessage toCommon() {
 		// TODO: Attachment
-		envoy.data.GroupMessage groupMessage = new MessageBuilder(sender.getID(), recipient.getID(), id).setDate(creationDate)
+		envoy.data.GroupMessage groupMessage = new MessageBuilder(sender.getID(), recipient.getID(), id).setCreationDate(creationDate)
 			.setForwarded(forwarded)
 			.setStatus(status)
 			.setText(text)
diff --git a/src/main/java/envoy/server/data/Message.java b/src/main/java/envoy/server/data/Message.java
index 5b81e7d..7127832 100755
--- a/src/main/java/envoy/server/data/Message.java
+++ b/src/main/java/envoy/server/data/Message.java
@@ -104,7 +104,7 @@ public class Message {
 	public envoy.data.Message toCommon() {
 		// TODO: Attachment
 		envoy.data.Message message = new MessageBuilder(sender.getID(), recipient.getID(), id).setText(text)
-			.setDate(creationDate)
+			.setCreationDate(creationDate)
 			.setStatus(status)
 			.setForwarded(forwarded)
 			.build();