X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fmessage.c;h=62f4b21dd9f65438130c777e569b8f4310d9ab6b;hb=de7b76abbd466db7bfc097f16cc1df4fe8389250;hp=df604d72225ac9554edc8ba3d2126b55204a6606;hpb=eab38ff6950a0075741f24ac9fb0d9eaf7df8671;p=apps%2Fmadmutt.git

diff --git a/imap/message.c b/imap/message.c
index df604d7..62f4b21 100644
--- a/imap/message.c
+++ b/imap/message.c
@@ -79,7 +79,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
 
   /* instead of downloading all headers and then parsing them, we parse them
    * as they come in. */
-  fp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
+  fp = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
   if (!fp) {
     mutt_error(_("Could not create temporary file"));
     mutt_sleep(2);
@@ -371,7 +371,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
     mutt_message _("Fetching message...");
 
   cache->uid = HEADER_DATA (h)->uid;
-  msg->fp = m_tempfile(path, sizeof(path), NONULL(MCore.tmpdir), NULL);
+  msg->fp = m_tempfile(path, sizeof(path), NONULL(mod_core.tmpdir), NULL);
   if (!msg->fp) {
     return -1;
   }
@@ -384,7 +384,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
 
   snprintf (buf, sizeof (buf), "UID FETCH %u %s", HEADER_DATA (h)->uid,
             (mutt_bit_isset (idata->capabilities, IMAP4REV1) ?
-             (option (OPTIMAPPEEK) ? "BODY.PEEK[]" : "BODY[]") : "RFC822"));
+             "BODY.PEEK[]" : "RFC822"));
 
   imap_cmd_start (idata, buf);
   do {