2 files changed, 17 insertions, 4 deletions
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index c04fbb38f9..e140d9002f 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -288,6 +288,11 @@ imap_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
 	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
 	gint i, max;
 
+	if (expunge) {
+		imap_expunge (folder, ex);
+		return;
+	}
+	
 	/* Set the flags on any messages that have changed this session */
 	if (imap_folder->summary) {
 		max = imap_folder->summary->len;
@@ -331,9 +336,6 @@ imap_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
 			}
 		}
 	}
-	
-	if (expunge)
-		imap_expunge (folder, ex);
 }
 
 static void
@@ -343,6 +345,8 @@ imap_expunge (CamelFolder *folder, CamelException *ex)
 	gint status;
 
 	g_return_if_fail (folder != NULL);
+
+	imap_sync (folder, FALSE, ex);
 	
 	status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder->parent_store), folder,
 					      &result, "EXPUNGE");
@@ -528,7 +532,7 @@ imap_append_message (CamelFolder *folder, CamelMimeMessage *message, guint32 fla
 			*(flagstr + strlen (flagstr) - 1) = ')';
 	}
 	
-	/* FIXME: len isn't really correct I don't think, we need to filter and possibly other things */
+	/* FIXME: len isn't really correct I don't think, we need to crlf/dot filter */
 	status = camel_imap_command_extended (CAMEL_IMAP_STORE (folder->parent_store),
 					      folder, &result, "APPEND %s%s {%d}\r\n%s",
 					      folder_path, flagstr ? flagstr : "",
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index c03ae182cf..c9e70731a3 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -418,10 +418,19 @@ static gboolean
 imap_disconnect (CamelService *service, CamelException *ex)
 {
 	CamelImapStore *store = CAMEL_IMAP_STORE (service);
+	char *result;
+	int status;
 
 	if (!service->connected)
 		return TRUE;
 
+	/* send the logout command */
+	status = camel_imap_command_extended (CAMEL_IMAP_STORE (service), NULL, &result, "LOGOUT");
+	if (status != CAMEL_IMAP_OK) {
+		/* Oh fuck it, we're disconnecting anyway... */
+	}
+	g_free (result);
+	
 	if (!service_class->disconnect (service, ex))
 		return FALSE;