SMTP-Relaying: implement a method to choose a relay by sender email address or username

[citadel.git] / citadel / modules / imap / imap_fetch.c

diff --git a/citadel/modules/imap/imap_fetch.c b/citadel/modules/imap/imap_fetch.c
index 38de324e694091186eb5b2c415d5eed9598e8680..396e6070c6808516cdee483925cec7f8bbad8589 100644 (file)
--- a/citadel/modules/imap/imap_fetch.c
+++ b/citadel/modules/imap/imap_fetch.c
@@ -190,7 +190,7 @@ void imap_fetch_rfc822(long msgnum, const char *whichfmt) {
                CCC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
                CtdlOutputMsg(msgnum, MT_RFC822,
                        (need_body ? HEADERS_ALL : HEADERS_FAST),
-                       0, 1, NULL, SUPPRESS_ENV_TO
+                       0, 1, NULL, SUPPRESS_ENV_TO, NULL, NULL
                );
                if (!need_body) IAPuts("\r\n"); /* extra trailing newline */
                Imap->cached_rfc822 = CCC->redirect_buffer;
@@ -209,8 +209,6 @@ void imap_fetch_rfc822(long msgnum, const char *whichfmt) {
         * intervening blank line to be part of the headers, not the text.
         */
        headers_size = 0;
-       text_size = 0;
-       total_size = 0;
 
        if (need_body) {
                StrBuf *Line = NewStrBuf();
@@ -604,7 +602,7 @@ void imap_strip_headers(StrBuf *section) {
                StrBufSipLine(Line, CCC->redirect_buffer, &Ptr);
 
                if (!isspace(ChrPtr(Line)[0])) {
-                       ok = 0;
+
                        if (doing_headers == 0) ok = 1;
                        else {
                                /* we're supposed to print all headers that are not matching the filter list */