diff --git a/src/com/fsck/k9/mail/store/WebDavStore.java b/src/com/fsck/k9/mail/store/WebDavStore.java
index df1f0a38c..4deb228bd 100644
--- a/src/com/fsck/k9/mail/store/WebDavStore.java
+++ b/src/com/fsck/k9/mail/store/WebDavStore.java
@@ -1977,9 +1977,10 @@ public class WebDavStore extends Store
                         out = new ByteArrayOutputStream();
                     }
                     open(OpenMode.READ_WRITE);
-                    message.writeTo(
-                        new EOLConvertingOutputStream(
-                            new BufferedOutputStream(out, 1024)));
+                    EOLConvertingOutputStream msgOut = new EOLConvertingOutputStream(
+                            new BufferedOutputStream(out, 1024));
+                    message.writeTo(msgOut);
+                    msgOut.flush();
 
                     bodyEntity = new StringEntity(out.toString(), "UTF-8");
                     bodyEntity.setContentType("message/rfc822");