\Draft and \Deleted flags used opposite flag chars in X-Status header. We

were incompatible with other mbox accessing software.

--HG--
branch : HEAD

diff --git a/src/lib-index/mbox/mbox-index.c b/src/lib-index/mbox/mbox-index.c
index 016902043732a746fb7e179c97dd98b98c579c0a..d2c80398f5d79bed5751855df69fb4d2fd7c479e 100644 (file)
--- a/src/lib-index/mbox/mbox-index.c
+++ b/src/lib-index/mbox/mbox-index.c
@@ -154,13 +154,13 @@ mbox_get_status_flags(const unsigned char *value, size_t len)
                case 'F':
                        flags |= MAIL_FLAGGED;
                        break;
-               case 'D':
+               case 'T':
                        flags |= MAIL_DRAFT;
                        break;
                case 'R':
                        flags |= MAIL_SEEN;
                        break;
-               case 'T':
+               case 'D':
                        flags |= MAIL_DELETED;
                        break;
                }

diff --git a/src/lib-index/mbox/mbox-rewrite.c b/src/lib-index/mbox/mbox-rewrite.c
index 23ec89d498208a275cec3e3313f74b13f2becb31..d6b2e5276d67e5f43585441d85b7dc0625b7d94a 100644 (file)
--- a/src/lib-index/mbox/mbox-rewrite.c
+++ b/src/lib-index/mbox/mbox-rewrite.c
@@ -218,9 +218,9 @@ static int mbox_write_xstatus(struct mbox_rewrite_context *ctx,
 
        str = t_strconcat("X-Status: ",
                          (ctx->msg_flags & MAIL_ANSWERED) ? "A" : "",
-                         (ctx->msg_flags & MAIL_DRAFT) ? "D" : "",
+                         (ctx->msg_flags & MAIL_DELETED) ? "D" : "",
                          (ctx->msg_flags & MAIL_FLAGGED) ? "F" : "",
-                         (ctx->msg_flags & MAIL_DELETED) ? "T" : "",
+                         (ctx->msg_flags & MAIL_DRAFT) ? "T" : "",
                          x_status, NULL);
 
        if (o_stream_send_str(ctx->output, str) < 0)

diff --git a/src/lib-storage/index/mbox/mbox-save.c b/src/lib-storage/index/mbox/mbox-save.c
index 6c0dadc3bc7d28c90c8b0d48221171386f812259..6fe7f2b91fc0dc5a039eeda466195d2b3520b948 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-save.c
+++ b/src/lib-storage/index/mbox/mbox-save.c
@@ -131,11 +131,11 @@ static const char *get_system_flags(enum mail_flags flags)
 
                if ((flags & MAIL_ANSWERED) != 0)
                        str_append_c(str, 'A');
-               if ((flags & MAIL_DRAFT) != 0)
+               if ((flags & MAIL_DELETED) != 0)
                        str_append_c(str, 'D');
                if ((flags & MAIL_FLAGGED) != 0)
                        str_append_c(str, 'F');
-               if ((flags & MAIL_DELETED) != 0)
+               if ((flags & MAIL_DRAFT) != 0)
                        str_append_c(str, 'T');
                str_append_c(str, '\n');
        }