1 files changed, 4 insertions, 1 deletions
diff --git a/driver.c b/driver.c
index efe74a9c..e2ee2787 100644
--- a/driver.c
+++ b/driver.c
@@ -429,8 +429,11 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
 	/* for POP3, we can get the size of one mail only! Unfortunately, this
 	 * protocol specific test cannot be done elsewhere as the protocol
 	 * could be "auto". */
-	if (ctl->server.protocol == P_POP3)
+	switch (ctl->server.protocol)
+	{
+	    case P_POP3: case P_APOP: case P_RPOP:
 	    fetchsizelimit = 1;
+	}
 
 	/* Time to allocate memory to store the sizes */
 	xalloca(msgsizes, int *, sizeof(int) * fetchsizelimit);