rationalize the hcache patch.

[apps/madmutt.git] / lib-mx / mx.c

diff --git a/lib-mx/mx.c b/lib-mx/mx.c
index 231d140..b58a621 100644 (file)
--- a/lib-mx/mx.c
+++ b/lib-mx/mx.c
@@ -16,9 +16,9 @@
 #include <lib-sys/unix.h>
 #include <lib-mime/mime.h>
 #include <lib-ui/sidebar.h>
 #include <lib-sys/unix.h>
 #include <lib-mime/mime.h>
 #include <lib-ui/sidebar.h>

-#include <lib-crypt/crypt.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

+#include "crypt.h"

 #include "pattern.h"
 #include "buffy.h"
 #include "mx.h"
 #include "pattern.h"
 #include "buffy.h"
 #include "mx.h"


@@ -1080,7 +1080,7 @@ MESSAGE *mx_open_new_message (CONTEXT * dest, HEADER * hdr, int flags)
           p = hdr->env->from;
       }
 
           p = hdr->env->from;
       }
 

-      fprintf (msg->fp, "From %s %s", p ? p->mailbox : NONULL (Username),
+      fprintf (msg->fp, "From %s %s", p ? p->mailbox : NONULL(MCore.username),

                ctime (&msg->received));
     }
   }
                ctime (&msg->received));
     }
   }