diff --git a/src/java/davmail/pop/PopConnection.java b/src/java/davmail/pop/PopConnection.java
index 31260d50..aa5f0e70 100644
--- a/src/java/davmail/pop/PopConnection.java
+++ b/src/java/davmail/pop/PopConnection.java
@@ -235,7 +235,7 @@ public class PopConnection extends AbstractConnection {
                                 ExchangeSession.Message m = messages.get(message - 1);
                                 sendOK("");
                                 DoubleDotOutputStream doubleDotOutputStream = new DoubleDotOutputStream(os);
-                                IOUtil.write(m.getRawInputStream(), doubleDotOutputStream);
+                                IOUtil.write(m.getRawInputStream(), new TopOutputStream(doubleDotOutputStream, lines));
                                 doubleDotOutputStream.close();
                             } catch (NumberFormatException e) {
                                 sendERR("invalid command");