44c44
< 
---
> #define CHR_FILEFLAGS '-'
87c87,88
<   if ((p = strrchr (path, ':')) != NULL && mutt_strncmp (p + 1, "2,", 2) == 0)
---
>   //MCB 20010502 - if ((p = strrchr (path, ':')) != NULL && mutt_strncmp (p +
1, "2,", 2) == 0)
>   if ((p = strrchr (path, CHR_FILEFLAGS)) != NULL && mutt_strncmp (p + 1,
"2,", 2) == 0)
383c384,385
< 	      ":2,%s%s%s",
---
> 	      //MCB 20010502 - ":2,%s%s%s",
> 	      "%c2,%s%s%s", CHR_FILEFLAGS,
480,482d481
<   if (safe_fclose (&msg->fp) != 0)
<     return -1;
<   
488c487,488
<   if ((s = strchr (s, ':')))
---
>   //MCB 20010502 - if ((s = strchr (s, ':')))
>   if ((s = strchr (s, CHR_FILEFLAGS)))
535,537d534
<   if (safe_fclose (&msg->fp) != 0)
<     return -1;
<   
605d601
<   short restore = 1;
631d626
<     {
633,634d627
<       restore = 0;
<     }
658,659c651
<   else 
<     mx_close_message (&dest);
---
>   else mx_close_message (&dest);
661c653
<   if (rc == -1 && restore)
---
>   if (rc == -1)
703c695,696
<     if ((p = strchr (newpath, ':')) != NULL) *p = 0;
---
>     //MCB 20010502 - if ((p = strchr (newpath, ':')) != NULL) *p = 0;
>     if ((p = strchr (newpath, CHR_FILEFLAGS)) != NULL) *p = 0;
797c790,791
<   if((u = strrchr(dest, ':')))
---
>   //MCB 20010502 - if((u = strrchr(dest, ':')))
>   if((u = strrchr(dest, CHR_FILEFLAGS)))