--- camel/camel-vee-summary.c	2007-02-08 21:47:45.000000000 +0530
+++ /home/work/cvs/gnome2/evolution-data-server/camel/camel-vee-summary.c	2007-02-09 21:42:51.000000000 +0530
@@ -216,8 +216,16 @@ camel_vee_summary_add(CamelVeeSummary *s
 	}
 
 	mi = (CamelVeeMessageInfo *)camel_message_info_new(&s->summary);
-	mi->real = info;
-	camel_message_info_ref(info);
+
+	/* 
+	   WORKAROUND: Varadhan: BGO #352396
+	   Clone the original CamelMessageInfo, instead of just reffing it - as
+	   someone is doing a double un-ref and its quite hard to track it.
+	*/
+
+	/* clone doesn't clone the uid */
+	mi->real = camel_message_info_clone (info);
+	mi->real->uid = g_strdup (uid);
 	mi->info.uid = vuid;
 
 	camel_folder_summary_add(&s->summary, (CamelMessageInfo *)mi);
