* Applied patch submitted by 'uplink' to ignore spurious From: lines that may appear...

diff --git a/citadel/citmail.c b/citadel/citmail.c
index fb1c78cc7f7b56799d68e2db5d7a86ab0e8f1efc..a665e8cc70abc390f8b2f050d48045fb18aaa88d 100644 (file)
--- a/citadel/citmail.c
+++ b/citadel/citmail.c
@@ -232,11 +232,9 @@ int main(int argc, char **argv) {
                                fprintf(fp, "%s%s", fromline, buf);
                        }
                }
-               if (!strncasecmp(buf, "From:", 5)) {
+               if (in_body == 0 && !strncasecmp(buf, "From:", 5)) {
                        strcpy(fromline, buf);
-                       if (in_body == 0) {
-                               from_header = 1;
-                       }
+                       from_header = 1;
                }
 
                if (read_recipients_from_headers) {