From: ak1 <ak1@e385b8ad-14ed-0310-8656-cc95a2468c6d>
Date: Sun, 27 Feb 2005 23:49:26 +0000 (+0000)
Subject: Andreas Krennmair:
X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=2577cd17c7fd64b4d34e14e55e6f88cf4a6c852d

Andreas Krennmair:
	merged in latest mutt changes.


git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@113 e385b8ad-14ed-0310-8656-cc95a2468c6d
---

diff --git a/ChangeLog b/ChangeLog
index 171ddce..ddf2c53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-02-27 03:18:23  Brendan Cully  <brendan@kublai.com>  (brendan)
+
+	* imap/message.c: Turn brain back on before committing patches
+	(that modification I made to APPEND was bogus).
+
+2005-02-27 02:44:45  Dan Hopper  <ku4nf@austin.rr.com>  (brendan)
+
+	* imap/message.c: Don't lose N flag when uploading a message to an
+	IMAP mailbox. (Slightly modified from the original patch to
+	prevent spurious space characters).
+
 2005-02-21 04:42:34  Alain Bench  <messtic@oreka.com>  (roessler)
 
 	* parse.c, pgp.c, sendlib.c: Bcc should be RFC2047-encoded, too.
diff --git a/imap/message.c b/imap/message.c
index 96d7e22..3c5011c 100644
--- a/imap/message.c
+++ b/imap/message.c
@@ -562,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);