3 files changed, 14 insertions, 0 deletions
diff --git a/init.h b/init.h
index c672908a..df3b9f91 100644
--- a/init.h
+++ b/init.h
@@ -431,6 +431,14 @@ struct option_t MuttVars[] = {
   ** This variable controls whether or not attachments on outgoing messages
   ** are saved along with the main body of your message.
   */
+#ifdef _PGPPATH
+  { "fcc_clear",	DT_BOOL, R_NONE, OPTFCCCLEAR, 0 },
+  /*
+  ** .pp
+  ** When this variable is \fIset\fP, FCCs will be stored unencrypted and
+  ** unsigned, even when the actual message is encrypted and/or signed.
+  */
+#endif
   { "folder",		DT_PATH, R_NONE, UL &Maildir, UL "~/Mail" },
   /*
   ** .pp
diff --git a/mutt.h b/mutt.h
index a629076c..b72a7cb1 100644
--- a/mutt.h
+++ b/mutt.h
@@ -286,6 +286,7 @@ enum
   OPTENCODEFROM,
   OPTFASTREPLY,
   OPTFCCATTACH,
+  OPTFCCCLEAR,
   OPTFOLLOWUPTO,
   OPTFORCENAME,
   OPTFORWDECODE,
diff --git a/send.c b/send.c
index 4d880cc1..b9de93f2 100644
--- a/send.c
+++ b/send.c
@@ -1350,6 +1350,11 @@ main_loop:
     BODY *save_parts = NULL;
 #endif /* _PGPPATH */
 
+#ifdef _PGPPATH
+    if (msg->pgp && option (OPTFCCCLEAR))
+      msg->content = clear_content;
+#endif
+
     /* check to see if the user wants copies of all attachments */
     if (!option (OPTFCCATTACH) && msg->content->type == TYPEMULTIPART)
     {