When $flag_safe is set, flagged messages cannot be deleted.

This saves them from bulk operations on threads and tagged messages.  To
remove a flagged message, first unflag it.

1 files changed, 2 insertions, 1 deletions

diff --git a/flags.c b/flags.c
index 3e802513..e47950dc 100644
--- a/flags.c
+++ b/flags.c
@@ -45,7 +45,8 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
 
       if (bf)
       {
-	if (!h->deleted && !ctx->readonly)
+	if (!h->deleted && !ctx->readonly
+	    && (!h->flagged || !option(OPTFLAGSAFE)))
 	{
 	  h->deleted = 1;
           update = 1;