* Reversed the previous change because it made things b0rken

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 1f349e23f8aa40916c57aba0748bb460084b8d78..a4929a0945a27010c3273e259f0e721a72ade85e 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 611.8  2003/11/14 20:15:44  ajc
+ * Reversed the previous change because it made things b0rken
+
  Revision 611.7  2003/11/14 20:04:28  ajc
  * IMAP FETCH ENVELOPE now outputs more fields correctly.
 
@@ -5084,4 +5087,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/imap_fetch.c b/citadel/imap_fetch.c
index d1f4f36e350a4953ac832f9b0dfc69277a1c8dff..199a0bb0dda1f1e5296e1670cda8d10707eba875 100644 (file)
--- a/citadel/imap_fetch.c
+++ b/citadel/imap_fetch.c
@@ -316,20 +316,16 @@ void imap_fetch_envelope(long msgnum, struct CtdlMessage *msg) {
        imap_output_envelope_from(msg);
 
        /* Sender */
-       fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Sender");
-       if (fieldptr != NULL) {
-               imap_strout(fieldptr);
-               phree(fieldptr);
+       if (0) {
+               /* FIXME */
        }
        else {
                imap_output_envelope_from(msg);
        }
 
        /* Reply-to */
-       fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Reply-to");
-       if (fieldptr != NULL) {
-               imap_strout(fieldptr);
-               phree(fieldptr);
+       if (0) {
+               /* FIXME */
        }
        else {
                imap_output_envelope_from(msg);