diff --git a/src/libemail-engine/mail-tools.c b/src/libemail-engine/mail-tools.c
index e042d39020..3f95a66fd5 100644
--- a/src/libemail-engine/mail-tools.c
+++ b/src/libemail-engine/mail-tools.c
@@ -294,6 +294,13 @@ mail_tool_make_message_attachment (CamelMimeMessage *message)
 	part = camel_mime_part_new ();
 	camel_mime_part_set_disposition (part, "inline");
 	camel_mime_part_set_description (part, desc);
+	if (!g_str_has_suffix (desc, ".eml")) {
+		gchar *fnm;
+
+		fnm = g_strconcat (desc, ".eml", NULL);
+		camel_mime_part_set_filename (part, fnm);
+		g_free (fnm);
+	}
 	camel_medium_set_content (
 		CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER (message));
 	camel_mime_part_set_content_type (part, "message/rfc822");