diff --git a/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java b/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java
index 4e019c53..f340a3a4 100644
--- a/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java
+++ b/src/main/java/org/apache/james/mime4j/MimeBoundaryInputStream.java
@@ -115,7 +115,7 @@ public int read(byte[] b, int off, int len) throws IOException {
         }
         fillBuffer();
         if (!hasData()) {
-            return 0;
+            return read(b, off, len);
         }
         int chunk = Math.min(len, limit - buffer.pos());
         return buffer.read(b, off, chunk);