diff --git a/ocpp-common/src/main/java/eu/chargetime/ocpp/model/Message.java b/ocpp-common/src/main/java/eu/chargetime/ocpp/model/Message.java
index 17fa4af0c..d909916f8 100644
--- a/ocpp-common/src/main/java/eu/chargetime/ocpp/model/Message.java
+++ b/ocpp-common/src/main/java/eu/chargetime/ocpp/model/Message.java
@@ -27,6 +27,8 @@ of this software and associated documentation files (the "Software"), to deal
 SOFTWARE.
 */
 
+import eu.chargetime.ocpp.utilities.MoreObjects;
+
 /** Wrapper class for a message */
 public class Message {
   private String id;
@@ -86,4 +88,13 @@ public String getAction() {
   public void setAction(String action) {
     this.action = action;
   }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("id", id)
+        .add("payload", payload)
+        .add("action", action)
+        .toString();
+  }
 }