Index: mail/ChangeLog
===================================================================
--- mail/ChangeLog	(revision 37227)
+++ mail/ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2009-02-05  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #569700
+
+	* em-format-html.c: (emfh_gethttp):
+	Stop reading from a network when operation was canceled.
+
 2009-02-04  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
 
 	** Fix for bug #568176
Index: mail/em-format-html.c
===================================================================
--- mail/em-format-html.c	(revision 37227)
+++ mail/em-format-html.c	(working copy)
@@ -521,6 +521,10 @@ static void emfh_gethttp(struct _EMForma
 		costream = camel_data_cache_add(emfh_http_cache, EMFH_HTTP_CACHE_PATH, job->u.uri, NULL);
 
 	do {
+		if (camel_operation_cancel_check (NULL)) {
+			n = -1;
+			break;
+		}
 		/* FIXME: progress reporting in percentage, can we get the length always?  do we care? */
 		n = camel_stream_read(instream, buffer, sizeof (buffer));
 		if (n > 0) {
