aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/em-format.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index a13a22405a..455d42d27d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,9 @@
2009-01-29 Srinivasa Ragavan <sragavan@novell.com>
+ * em-format.c: (em_format_format_text): Handle empty messages well.
+
+2009-01-29 Srinivasa Ragavan <sragavan@novell.com>
+
** Fix for bug #546637
* em-folder-view.c: (emfv_popup_source): Ensure uid for source view
diff --git a/mail/em-format.c b/mail/em-format.c
index 4af272a3ff..048cf6525d 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -1124,7 +1124,7 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw)
camel_object_unref(filter_stream);
camel_stream_reset (mem_stream);
- if (max == -1 || size < (max * 1024) || emf->composer) {
+ if (max == -1 || size == -1 || size < (max * 1024) || emf->composer) {
camel_stream_write_to_stream(mem_stream, (CamelStream *)stream);
camel_stream_flush((CamelStream *)stream);
} else {