Fix debian bug #275060 (editing on an imap server loses its flags).

Remove trailing delimiter from IMAP folder names.

diff --git a/imap/message.c b/imap/message.c
index 7af9cc0030fde853dd77cceaa98c93e7dcac9eed..7b39c06de6139f26c14ca45c6f903760cc17a0a3 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -556,7 +556,10 @@ 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) {%lu}", mbox, (unsigned long)len);
+  snprintf (buf, sizeof (buf), "APPEND %s (\\Seen%s%s) {%lu}", mbox,
+           msg->flags.replied ? " \\Answered" : "",
+           msg->flags.flagged ? " \\Flagged" : "",
+           (unsigned long) len);
 
   imap_cmd_start (idata, buf);
 

diff --git a/imap/util.c b/imap/util.c
index 96c8caf8efd63947fd6d81f5d98a8efed140825b..5062786b3c51b2e25d6b9f35d1a1f09f1f35867e 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -271,6 +271,7 @@ void imap_free_idata (IMAP_DATA** idata) {
  * in IMAP.  Additionally, the filesystem converts multiple hierarchy
  * delimiters into a single one, ie "///" is equal to "/".  IMAP servers
  * are not required to do this.
+ * Moreover, IMAP servers may dislike the path ending with the delimiter.
  */
 char *imap_fix_path (IMAP_DATA *idata, char *mailbox, char *path, 
     size_t plen)
@@ -297,6 +298,8 @@ char *imap_fix_path (IMAP_DATA *idata, char *mailbox, char *path,
     }
     x++;
   }
+  if (x && path[--x] != idata->delim)
+    x++;
   path[x] = '\0';
   return path;
 }