Index: camel/camel-stub-marshal.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/camel/camel-stub-marshal.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- camel/camel-stub-marshal.c	31 Jul 2006 10:59:17 -0000	1.6
+++ camel/camel-stub-marshal.c	7 Aug 2006 14:01:25 -0000	1.7
@@ -90,8 +90,12 @@ do_read (CamelStubMarshal *marshal, char
 	ssize_t n;
 	
 	do {
-		if ((n = camel_read (marshal->fd, buf + nread, len - nread)) <= 0)
-			break;
+		if ((n = camel_read (marshal->fd, buf + nread, len - nread)) <= 0) {
+			if (errno != ETIMEDOUT)
+				break;
+			else
+				n = 0;
+		}
 		nread += n;
 	} while (nread < len);
 	
