* fix off by one while copying email headers

[citadel.git] / citadel / msgbase.c

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 78d5f296db3d57b94da381428b04b1a66b442a17..429f17a8b4e6b56baef7f91a26f6f20fb17c8d94 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -971,6 +971,12 @@ void memfmout(
                        }
                }
        }
+       if (len) {
+               client_write(outbuf, len);
+               len = 0;
+               client_write(nl, nllen);
+               column = 0;
+       }
 }
 
 
@@ -2056,12 +2062,9 @@ START_TEXT:
                                        if ((!eoh) &&
                                            (*mptr == '\n'))
                                        {
-                                               if (crlf) {
-                                                       eoh = (*(mptr+1) == '\r') && (*(mptr+2) == '\n');
-                                               }
-                                               else {
+                                               eoh = (*(mptr+1) == '\r') && (*(mptr+2) == '\n');
+                                               if (!eoh)
                                                        eoh = *(mptr+1) == '\n';
-                                               }
                                        }
 
                                        if (