[evolution-data-server/gnome-3-2] Bug #662473 - Moving mails between local folders removes labels

[Milan Crha <mcrha src gnome org>]

commit 3d4406d783643e4e392aa3a679fb930246a33f24
Author: Milan Crha <mcrha redhat com>
Date:   Fri Nov 11 10:30:40 2011 +0100

    Bug #662473 - Moving mails between local folders removes labels

 camel/providers/local/camel-maildir-folder.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c
index bbae5c2..e8e2573 100644
--- a/camel/providers/local/camel-maildir-folder.c
+++ b/camel/providers/local/camel-maildir-folder.c
@@ -355,9 +355,14 @@ maildir_folder_transfer_messages_to_sync (CamelFolder *source,
 				}
 			} else {
 				CamelMessageInfo *clone;
+				CamelMaildirMessageInfo *mclone;
 
 				clone = camel_message_info_clone (info);
 				clone->summary = dest->summary;
+
+				mclone = (CamelMaildirMessageInfo *) clone;
+				/* preserve also UID, as it matches the file name */
+				mclone->info.info.uid = camel_pstring_strdup (camel_message_info_uid (info));
 				camel_maildir_info_set_filename (clone, g_strdup (new_filename));
 				/* unset deleted flag when transferring from trash folder */
 				if ((source->folder_flags & CAMEL_FOLDER_IS_TRASH) != 0)