diff --git a/history.txt b/history.txt
index 7c677461cb..2a262200fd 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,7 @@
-$Id: history.txt,v 1.445 2006/04/04 23:40:04 jrandom Exp $
+$Id: history.txt,v 1.446 2006/04/05 12:08:04 jrandom Exp $
+
+2006-04-06  jrandom
+    * Fixed a typo in the reply cleanup code
 
 * 2006-04-05  0.6.1.14 released
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 7ebba90ae1..5464e2d4e2 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.385 $ $Date: 2006/04/04 23:40:10 $";
+    public final static String ID = "$Revision: 1.386 $ $Date: 2006/04/05 12:08:10 $";
     public final static String VERSION = "0.6.1.14";
-    public final static long BUILD = 0;
+    public final static long BUILD = 1;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);
diff --git a/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java b/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
index c53cb14e30..23ca08466d 100644
--- a/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
+++ b/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
@@ -123,7 +123,8 @@ public class GarlicMessageBuilder {
         
         long timeFromNow = config.getExpiration() - ctx.clock().now();
         if (timeFromNow < 1*1000) {
-            log.error("Building a message expiring in " + timeFromNow + "ms: " + config, new Exception("created by"));
+            if (log.shouldLog(Log.WARN))
+                log.warn("Building a message expiring in " + timeFromNow + "ms: " + config, new Exception("created by"));
             return null;
         }
         
diff --git a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
index 5f4d05861a..ac02ef370b 100644
--- a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
+++ b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
@@ -151,7 +151,8 @@ public class OutboundMessageRegistry {
             if (oldMsg != null) {
                 List multi = null;
                 if (oldMsg instanceof OutNetMessage) {
-                    multi = Collections.synchronizedList(new ArrayList(4));
+                    //multi = Collections.synchronizedList(new ArrayList(4));
+                    multi = new ArrayList(4);
                     multi.add(oldMsg);
                     multi.add(msg);
                     _selectorToMessage.put(sel, multi);
@@ -222,10 +223,12 @@ public class OutboundMessageRegistry {
                     List msgs = null;
                     synchronized (_selectorToMessage) {
                         Object o = _selectorToMessage.remove(sel);
-                        if (o instanceof OutNetMessage)
+                        if (o instanceof OutNetMessage) {
                             msg = (OutNetMessage)o;
-                        else if (o instanceof List)
-                            msgs = new ArrayList((List)o);
+                        } else if (o instanceof List) {
+                            //msgs = new ArrayList((List)o);
+                            msgs = (List)o;
+                        }
                     }
                     if (msg != null) {
                         synchronized (_activeMessages) {
@@ -239,7 +242,7 @@ public class OutboundMessageRegistry {
                             _activeMessages.removeAll(msgs);
                         }
                         for (int j = 0; j < msgs.size(); j++) {
-                            msg = (OutNetMessage)msgs.get(i);
+                            msg = (OutNetMessage)msgs.get(j);
                             Job fail = msg.getOnFailedReplyJob();
                             if (fail != null)
                                 _context.jobQueue().addJob(fail);