Index: src/test/org/apache/james/pop3server/POP3ServerTest.java
===================================================================
--- src/test/org/apache/james/pop3server/POP3ServerTest.java	(revision 64)
+++ src/test/org/apache/james/pop3server/POP3ServerTest.java	(revision )
@@ -195,7 +195,7 @@
         assertNotNull(r2);
         r2.close();
 
-        boolean deleted = m_pop3Protocol.deleteMessage(entries[0].number);
+        boolean deleted = m_pop3Protocol.deleteMessage(entries[1].number);
 
         assertTrue(deleted);
         assertEquals(1, m_pop3Protocol.getState());
@@ -225,6 +225,9 @@
         r3.close();
     }
 
+    /**
+     * Creates two messages whereas the second message has non content (size=0).
+     */
     private void setupTestMails(MockMailRepository mailRep) throws MessagingException {
         ArrayList recipients = new ArrayList();
         recipients.add(new MailAddress("recipient@test.com"));
