X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fmessage.c;h=e7e7a17368cb459684821121a18a8bf5bda02653;hb=a548b928816889f8f2aa5bfe8f755d8234ce19db;hp=2b7a8e0a6844dd63fa6489f5bb9c4993310185f4;hpb=f404a0ca916be07049af51a3022baaaaab94def6;p=apps%2Fmadmutt.git

diff --git a/imap/message.c b/imap/message.c
index 2b7a8e0..e7e7a17 100644
--- a/imap/message.c
+++ b/imap/message.c
@@ -36,7 +36,11 @@
 #include "pgp.h"
 #endif
 
+#if HAVE_STDINT_H
 #include <stdint.h>
+#elif HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 
 static void flush_buffer(char* buf, size_t* len, CONNECTION* conn);
 static int msg_fetch_header (CONTEXT* ctx, IMAP_HEADER* h, char* buf,
@@ -558,9 +562,12 @@ int imap_append_message (CONTEXT *ctx, MESSAGE *msg)
   rewind (fp);
   
   imap_munge_mbox_name (mbox, sizeof (mbox), mailbox);
-  snprintf (buf, sizeof (buf), "APPEND %s (\\Seen%s%s) {%lu}", mbox,
-	    msg->flags.replied ? " \\Answered" : "",
-	    msg->flags.flagged ? " \\Flagged" : "",
+  snprintf (buf, sizeof (buf), "APPEND %s (%s%s%s%s%s) {%lu}", mbox,
+	    msg->flags.read    ? "\\Seen"      : "",
+	    msg->flags.read && (msg->flags.replied || msg->flags.flagged) ? " " : "",
+	    msg->flags.replied ? "\\Answered" : "",
+	    msg->flags.replied && msg->flags.flagged ? " " : "",
+	    msg->flags.flagged ? "\\Flagged"  : "",
 	    (unsigned long) len);
 
   imap_cmd_start (idata, buf);
@@ -924,7 +931,6 @@ static size_t imap_hcache_keylen (const char *fn)
 static int msg_fetch_header_fetch (CONTEXT* ctx, IMAP_HEADER* h, char* buf, FILE* fp)
 {
   IMAP_DATA* idata;
-  long bytes;
   int rc = -1; /* default now is that string isn't FETCH response*/
 
   idata = (IMAP_DATA*) ctx->data;