diff -up evolution-data-server-3.8.5/camel/camel-tcp-stream-raw.c.imapx-dont-timeout-on-reads evolution-data-server-3.8.5/camel/camel-tcp-stream-raw.c --- evolution-data-server-3.8.5/camel/camel-tcp-stream-raw.c.imapx-dont-timeout-on-reads 2013-07-23 07:57:42.000000000 -0400 +++ evolution-data-server-3.8.5/camel/camel-tcp-stream-raw.c 2014-01-16 10:13:51.984089439 -0500 @@ -329,7 +329,7 @@ read_from_prfd (PRFileDesc *fd, PR_GetCurrentThread (), (GDestroyNotify) NULL); do { - bytes_read = PR_Recv (fd, buffer, n, 0, IO_TIMEOUT); + bytes_read = PR_Read (fd, buffer, n); } while (bytes_read == -1 && PR_GetError () == PR_IO_PENDING_ERROR); if (cancel_id > 0)