3 files changed, 7 insertions, 2 deletions
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 67d3c10411..6e4f15b315 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2422,7 +2422,7 @@ comp_editor_get_mime_attach_list (CompEditor *editor)
 		CamelDataWrapper *wrapper;
 		CamelStreamMem *mstream;
 		unsigned char *buffer = NULL;
-		const char *desc;
+		const char *desc, *disp;
 
 		cal_mime_attach = g_malloc0 (sizeof (struct CalMimeAttach));
 		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (l->data));
@@ -2441,6 +2441,10 @@ comp_editor_get_mime_attach_list (CompEditor *editor)
 		cal_mime_attach->description = g_strdup (desc);
 		cal_mime_attach->content_type = g_strdup (camel_data_wrapper_get_mime_type (wrapper));
 		
+		disp = camel_mime_part_get_disposition ((CamelMimePart *)l->data);
+		if (disp && !g_ascii_strcasecmp(disp, "inline"))	
+			cal_mime_attach->disposition = TRUE;
+			
 		attach_list = g_slist_append (attach_list, cal_mime_attach);
 
 		camel_object_unref (mstream);
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 9f093ad329..b38f0abe12 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -994,7 +994,7 @@ append_cal_attachments (GNOME_Evolution_Composer composer_server, ECalComponent
 
 		GNOME_Evolution_Composer_attachData (composer_server,
 						     content_type, filename, description,
-						     TRUE, attach_data,
+						     mime_attach->disposition, attach_data,
 						     &ev);
 		if (BONOBO_EX (&ev)) {
 			g_warning ("Unable to add attachments in composer");
diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
index d3031cdd1d..8cc8fe86ef 100644
--- a/calendar/gui/itip-utils.h
+++ b/calendar/gui/itip-utils.h
@@ -25,6 +25,7 @@ struct CalMimeAttach {
 	char *content_type;
 	char *description;
 	char *encoded_data;
+	gboolean disposition;
 	guint length;
 };