Enable the use of %F in conditionals. From Aaron Schrab

<aaron+mutt@schrab.com>.

1 files changed, 8 insertions, 3 deletions

diff --git a/hdrline.c b/hdrline.c
index b63b0cd8..4c628182 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -412,9 +412,14 @@ hdr_format_str (char *dest,
       break;
 
     case 'F':
-      snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-      make_from (hdr->env, buf2, sizeof (buf2), 0);
-      snprintf (dest, destlen, fmt, buf2);
+      if (!optional)
+      {
+        snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
+        make_from (hdr->env, buf2, sizeof (buf2), 0);
+        snprintf (dest, destlen, fmt, buf2);
+      }
+      else if (mutt_addr_is_user (hdr->env->from))
+        optional = 0;
       break;
 
     case 'i':