diff --git a/src/lib-storage/index/pop3c/pop3c-client.c b/src/lib-storage/index/pop3c/pop3c-client.c
index d35ebeafe7..1b5ab902d7 100644
--- a/src/lib-storage/index/pop3c/pop3c-client.c
+++ b/src/lib-storage/index/pop3c/pop3c-client.c
@@ -20,7 +20,7 @@
 #define POP3C_MAX_INBUF_SIZE (1024*32)
 #define POP3C_DNS_LOOKUP_TIMEOUT_MSECS (1000*30)
 #define POP3C_CONNECT_TIMEOUT_MSECS (1000*30)
-#define POP3C_COMMAND_TIMEOUT_MSECS (1000*30)
+#define POP3C_COMMAND_TIMEOUT_MSECS (1000*60*5)
 
 enum pop3c_client_state {
 	/* No connection */