[evolution-data-server] Bug #610988 - Filter can't set labels on IMAP messages

[Milan Crha <mcrha src gnome org>]

commit 696b658a8626bc5b8872363aaeef156d4c9725d4
Author: Milan Crha <mcrha redhat com>
Date:   Tue Feb 21 15:26:01 2012 +0100

    Bug #610988 - Filter can't set labels on IMAP messages

 camel/providers/imap/camel-imap-folder.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 657e547..1ee2271 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -1259,7 +1259,9 @@ imap_rescan (CamelFolder *folder,
 		 * Because server always reports NULL, which means none, which
 		 * will remove user's flags from local machine, which is bad.
 		*/
-		if ((folder->permanent_flags & CAMEL_MESSAGE_USER) != 0 && merge_custom_flags (info, new[j].custom_flags))
+		if ((folder->permanent_flags & CAMEL_MESSAGE_USER) != 0 &&
+		    (iinfo->info.flags & CAMEL_MESSAGE_FOLDER_FLAGGED) == 0 &&
+		    merge_custom_flags (info, new[j].custom_flags))
 			changed = TRUE;
 
 		if (changed) {