diff --git a/configure.ac b/configure.ac
index 71d3d769..e08e8618 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,8 @@ AS_IF([test "x$have_gtest" = "xno"],[
      AC_MSG_WARN([You need GLIB version >= 2.22 to build the tests])
 ])
 
-# gmime 2.4 or 2.6? mu has only been tested with gmime-2.4, but Fedora
+# gmime 2.4 or 2.6?
+# mu has only been tested with gmime-2.4, but Fedora
 # 14 ships with gmime 2.5.x, which registers itself (pkgconfig) as 2.6
 # it is reported mu works fine with this new gmime as well, so we support
 # both; based on patch by GooseYArd
diff --git a/src/mu-msg-part.c b/src/mu-msg-part.c
index 7ecd86fa..6f39338e 100644
--- a/src/mu-msg-part.c
+++ b/src/mu-msg-part.c
@@ -354,7 +354,7 @@ write_part_to_fd (GMimePart *part, int fd, GError **err)
 			      * give errors...*/
 
 	rv = g_mime_data_wrapper_write_to_stream (wrapper, stream);
-	if (!rv)
+	if (rv == -1)
 		g_set_error (err, 0, MU_ERROR_GMIME,
 			     "failed to write to stream");