diff --git a/src/main/java/org/subethamail/smtp/internal/io/BdatInputStream.java b/src/main/java/org/subethamail/smtp/internal/io/BdatInputStream.java
index 815b1f7e..0e78c8fd 100644
--- a/src/main/java/org/subethamail/smtp/internal/io/BdatInputStream.java
+++ b/src/main/java/org/subethamail/smtp/internal/io/BdatInputStream.java
@@ -43,7 +43,6 @@ public int read() throws IOException {
                 remainingSize--;
                 return v;
             } else if (isLast) {
-                session.sendResponse("250 Message OK, " + size + " bytes received (last chunk)");
                 return -1;
             } else {
                 session.sendResponse("250 Message OK, " + size + " bytes received");
diff --git a/src/test/java/org/subethamail/smtp/BdatTest.java b/src/test/java/org/subethamail/smtp/BdatTest.java
index c4382396..459b6010 100644
--- a/src/test/java/org/subethamail/smtp/BdatTest.java
+++ b/src/test/java/org/subethamail/smtp/BdatTest.java
@@ -56,7 +56,7 @@ public void testBadBdatCommand() throws UnknownHostException, SMTPException, IOE
         }
     }
 
-    @Test
+    @Test(timeout=20000)
     public void testTwoBdatCommands() throws UnknownHostException, SMTPException, IOException {
         MyListener listener = new MyListener();
         SMTPServer server = SMTPServer.port(25000).messageHandler(listener).build();