diff --git a/router/java/src/net/i2p/router/OutNetMessage.java b/router/java/src/net/i2p/router/OutNetMessage.java
index 2ee6dbc98..749baeb67 100644
--- a/router/java/src/net/i2p/router/OutNetMessage.java
+++ b/router/java/src/net/i2p/router/OutNetMessage.java
@@ -143,22 +143,28 @@ public class OutNetMessage {
      */
     public RouterInfo getTarget() { return _target; }
     public void setTarget(RouterInfo target) { _target = target; }
+
     /**
      * Specifies the message to be sent
      *
      */
     public I2NPMessage getMessage() { return _message; }
+
     public void setMessage(I2NPMessage msg) {
         _message = msg;
         if (msg != null) {
-            _messageType = msg.getClass().getName();
+            _messageType = msg.getClass().getSimpleName();
             _messageTypeId = msg.getType();
             _messageId = msg.getUniqueId();
             _messageSize = _message.getMessageSize();
         }
     }
     
+    /**
+     *  @return the simple class name
+     */
     public String getMessageType() { return _messageType; }
+
     public int getMessageTypeId() { return _messageTypeId; }
     public long getMessageId() { return _messageId; }
     
@@ -273,12 +279,13 @@ public class OutNetMessage {
      * we may keep the object around for a while to use its ID, jobs, etc.
      */
     public void discardData() {
-        long timeToDiscard = _context.clock().now() - _created;
         if ( (_message != null) && (_messageSize <= 0) )
             _messageSize = _message.getMessageSize();
-        if (_log.shouldLog(Log.DEBUG))
+        if (_log.shouldLog(Log.DEBUG)) {
+            long timeToDiscard = _context.clock().now() - _created;
             _log.debug("Discard " + _messageSize + "byte " + _messageType + " message after " 
                        + timeToDiscard);
+        }
         _message = null;
         //_context.statManager().addRateData("outNetMessage.timeToDiscard", timeToDiscard, timeToDiscard);
         //_context.messageStateMonitor().outboundMessageDiscarded();
@@ -312,7 +319,7 @@ public class OutNetMessage {
             buf.append("*no message*");
         } else {
             buf.append("a ").append(_messageSize).append(" byte ");
-            buf.append(_message.getClass().getName());
+            buf.append(_messageType);
         }
         buf.append(" expiring on ").append(new Date(_expiration));
         if (_failedTransports != null)
diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java
index cf659a87f..9fd9426b4 100644
--- a/router/java/src/net/i2p/router/transport/TransportImpl.java
+++ b/router/java/src/net/i2p/router/transport/TransportImpl.java
@@ -204,7 +204,7 @@ public abstract class TransportImpl implements Transport {
 
         if (msToSend > 1000) {
             if (_log.shouldLog(Log.WARN))
-                _log.warn("afterSend slow: [success=" + sendSuccessful + "] " + msg.getMessageSize() + "byte "
+                _log.warn("afterSend slow: [success=" + sendSuccessful + "] " + msg.getMessageSize() + " byte "
                           + msg.getMessageType() + " " + msg.getMessageId() + " to "
                           + msg.getTarget().getIdentity().calculateHash().toBase64().substring(0,6) + " took " + msToSend
                           + "/" + msg.getTransmissionTime());
@@ -218,12 +218,12 @@ public abstract class TransportImpl implements Transport {
             if (!sendSuccessful)
                 level = Log.INFO;
             if (_log.shouldLog(level))
-                _log.log(level, "afterSend slow (" + lifetime + "/" + msToSend + "/" + msg.getTransmissionTime() + "): [success=" + sendSuccessful + "]" + msg.getMessageSize() + "byte "
+                _log.log(level, "afterSend slow (" + lifetime + "/" + msToSend + "/" + msg.getTransmissionTime() + "): [success=" + sendSuccessful + "] " + msg.getMessageSize() + " byte "
                           + msg.getMessageType() + " " + msg.getMessageId() + " from " + _context.routerHash().toBase64().substring(0,6)
                           + " to " + msg.getTarget().getIdentity().calculateHash().toBase64().substring(0,6) + ": " + msg.toString());
         } else {
             if (_log.shouldLog(Log.INFO))
-                _log.info("afterSend: [success=" + sendSuccessful + "]" + msg.getMessageSize() + "byte "
+                _log.info("afterSend: [success=" + sendSuccessful + "] " + msg.getMessageSize() + " byte "
                           + msg.getMessageType() + " " + msg.getMessageId() + " from " + _context.routerHash().toBase64().substring(0,6)
                           + " to " + msg.getTarget().getIdentity().calculateHash().toBase64().substring(0,6) + "\n" + msg.toString());
         }