Fixed -mime for forw and repl.

[mmh] / uip / replsbr.c

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 2affe31..2cdd847 100644 (file)
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -245,19 +245,13 @@ finished:
                fputs( badaddrs, out);
        }
 
-       /*
-       ** Check if we should filter the message
-       ** or add mhbuild directives
-       */
+       /* Check if we should filter the message */
        if (filter) {
                fflush(out);
                if (ferror(out))
                        adios(drft, "error writing");
 
                replfilter(inb, out, filter);
-       } else if (mime && mp) {
-               fprintf(out, "#forw [original message] +%s %s\n",
-                               mp->foldpath, m_name(mp->lowsel));
        }
 
        fflush(out);
@@ -265,6 +259,15 @@ finished:
                adios(drft, "error writing");
        fclose(out);
 
+       /* if we want mime, then add an attachment header */
+       if (!filter && mime && mp) {
+               char buffer[BUFSIZ];
+
+               snprintf(buffer, sizeof buffer, "+%s %s",
+                               mp->foldpath, m_name(mp->lowsel));
+               annotate(drft, attach_hdr, buffer, 1, 0, -2, 1);
+       }
+
        /* return dynamically allocated buffers */
        free(scanl);
        for (nxtbuf = compbuffers, i = ncomps; (cptr = *savecomp++);