Only write a newline between the headers and the content object if the

	* camel-mime-part.c (write_to_stream): Only write a newline
	between the headers and the content object if the content object
	is not a CamelMedium. (If the content is a medium, it may have its
	own headers, which then need to go before the blank line.)

svn path=/trunk/; revision=2647

1 files changed, 7 insertions, 4 deletions

diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index 6e2276df90..30c08a485f 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -504,11 +504,14 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 		}
 	}
 
-	if ( (count = camel_stream_write_string(stream,"\n")) == -1)
-		return -1;
-	total += count;
-
 	content = camel_medium_get_content_object (medium);
+
+	if (!CAMEL_IS_MEDIUM (content)) {
+		if ( (count = camel_stream_write_string(stream,"\n")) == -1)
+			return -1;
+		total += count;
+	}
+
 	if (content) {
 		if ( (count = camel_data_wrapper_write_to_stream(content, stream)) == -1 )
 			return -1;