diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index b11746b..e1ae8d7 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -3286,6 +3286,14 @@ camel_folder_get_message_sync (CamelFolder *folder,
 
 	camel_folder_unlock (folder, CAMEL_FOLDER_REC_LOCK);
 
+	if (message) {
+		CamelStore *store;
+
+		store = camel_folder_get_parent_store (folder);
+
+		camel_mime_message_set_source (message, camel_service_get_uid (CAMEL_SERVICE (store)));
+	}
+
 	camel_operation_pop_message (cancellable);
 
 	if (message != NULL && camel_debug_start (":folder")) {
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 7bad463..cc3d0c6 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -3664,9 +3664,6 @@ done:
 	if (msg) {
 		gboolean has_attachment;
 
-		/* FIXME, this shouldn't be done this way. */
-		camel_medium_set_header (CAMEL_MEDIUM (msg), "X-Evolution-Source", store->base_url);
-
 		if (!mi->info.mlist || !*mi->info.mlist) {
 			/* update mailing list information, if necessary */
 			gchar *mlist = camel_header_raw_check_mailing_list (&(CAMEL_MIME_PART (msg)->headers));
