diff --git a/router/java/src/net/i2p/data/i2np/TunnelMessage.java b/router/java/src/net/i2p/data/i2np/TunnelMessage.java
index 1c8c083e9..d8bb55ff5 100644
--- a/router/java/src/net/i2p/data/i2np/TunnelMessage.java
+++ b/router/java/src/net/i2p/data/i2np/TunnelMessage.java
@@ -146,6 +146,8 @@ public class TunnelMessage extends I2NPMessageImpl {
     public String toString() {
         StringBuffer buf = new StringBuffer();
         buf.append("[TunnelMessage: ");
+        buf.append("\n\tMessageId: ").append(getUniqueId());
+        buf.append("\n\tExpiration: ").append(getMessageExpiration());
         buf.append("\n\tTunnel ID: ").append(getTunnelId());
         buf.append("\n\tVerification Structure: ").append(getVerificationStructure());
         buf.append("\n\tEncrypted Instructions: ").append(getEncryptedDeliveryInstructions());