3 files changed, 16 insertions, 7 deletions
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 95969932ac..d6f2870833 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -1961,7 +1961,7 @@ imap_get_message (CamelFolder *folder, const char *uid, CamelException *ex)
 	/* If the server doesn't support IMAP4rev1, or we already have
 	 * the whole thing cached, fetch it in one piece.
 	 */
-	if (store->server_level < IMAP_LEVEL_IMAP4REV1 ||
+	if (store->server_level < IMAP_LEVEL_IMAP4REV1 || store->braindamaged ||
 	    (stream = camel_imap_folder_fetch_data (imap_folder, uid, "", TRUE, NULL)))
 		return get_message_simple (imap_folder, uid, stream, ex);
 
@@ -2237,9 +2237,12 @@ imap_update_summary (CamelFolder *folder, int exists,
 	GData *data;
 	
 	CAMEL_SERVICE_ASSERT_LOCKED (store, connect_lock);
-	if (store->server_level >= IMAP_LEVEL_IMAP4REV1)
-		header_spec = "HEADER.FIELDS.NOT (RECEIVED)";
-	else
+	if (store->server_level >= IMAP_LEVEL_IMAP4REV1) {
+		if (g_ascii_strcasecmp (((CamelService *) store)->url->host, "imap.web.de") != 0)
+			header_spec = "HEADER.FIELDS.NOT (RECEIVED)";
+		else
+			header_spec = "HEADER";
+	} else
 		header_spec = "0";
 	
 	/* Figure out if any of the new messages are already cached (which
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index f60b91c683..32bb41179b 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -595,8 +595,13 @@ connect_to_server (CamelService *service, int ssl_mode, int try_starttls, CamelE
 		
 		return FALSE;
 	}
+	
 	if (!strncmp(buf, "* PREAUTH", 9))
 		store->preauthed = TRUE;
+	
+	if (strstr (buf, "Courier-IMAP"))
+		store->braindamaged = TRUE;
+	
 	g_free (buf);
 	
 	/* get the imap server capabilities */
diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h
index fe57553658..b197cadda4 100644
--- a/camel/providers/imap/camel-imap-store.h
+++ b/camel/providers/imap/camel-imap-store.h
@@ -110,8 +110,8 @@ struct _CamelImapStore {
 	struct _CamelImapStoreSummary *summary;
 	
 	/* Information about the command channel / connection status */
-	gboolean connected;
-	gboolean preauthed;
+	guint connected:1;
+	guint preauthed:1;
 	char tag_prefix;
 	guint32 command;
 	CamelFolder *current_folder;
@@ -119,11 +119,12 @@ struct _CamelImapStore {
 	/* Information about the server */
 	CamelImapServerLevel server_level;
 	guint32 capabilities, parameters;
+	guint braindamaged:1;
 	/* NB: namespace should be handled by summary->namespace */
 	char *namespace, dir_sep, *base_url, *storage_path;
 	GHashTable *authtypes;
 	
-	gboolean renaming;
+	guint renaming:1;
 };